X-Git-Url: https://git.saurik.com/apt.git/blobdiff_plain/0ce20d50de158a45a588062754673014675ac993..51da0c3587c9d36a3c04b3e28b99d8331a29b230:/apt-pkg/sourcelist.cc diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 4e580ba04..e37899ec6 100644 --- a/apt-pkg/sourcelist.cc +++ b/apt-pkg/sourcelist.cc @@ -18,8 +18,18 @@ #include <apt-pkg/metaindex.h> #include <apt-pkg/indexfile.h> #include <apt-pkg/tagfile.h> - +#include <apt-pkg/pkgcache.h> +#include <apt-pkg/cacheiterators.h> + +#include <ctype.h> +#include <stddef.h> +#include <time.h> +#include <cstring> +#include <map> +#include <string> +#include <vector> #include <fstream> +#include <algorithm> #include <apti18n.h> /*}}}*/ @@ -78,12 +88,9 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List, { map<string, string> Options; - string URI = Tags.FindS("URI"); - if (!FixupURI(URI)) - { - _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); - return false; - } + string Enabled = Tags.FindS("Enabled"); + if (Enabled.size() > 0 && StringToBool(Enabled) == false) + return true; // Define external/internal options const char* option_deb822[] = { @@ -94,26 +101,45 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List, }; for (unsigned int j=0; j < sizeof(option_deb822)/sizeof(char*); j++) if (Tags.Exists(option_deb822[j])) - Options[option_internal[j]] = Tags.FindS(option_deb822[j]); + { + // for deb822 the " " is the delimiter, but the backend expects "," + std::string option = Tags.FindS(option_deb822[j]); + std::replace(option.begin(), option.end(), ' ', ','); + Options[option_internal[j]] = option; + } // now create one item per suite/section string Suite = Tags.FindS("Suites"); Suite = SubstVar(Suite,"$(ARCH)",_config->Find("APT::Architecture")); string const Section = Tags.FindS("Sections"); + string URIS = Tags.FindS("URIs"); + std::vector<std::string> list_uris = StringSplit(URIS, " "); std::vector<std::string> list_dist = StringSplit(Suite, " "); std::vector<std::string> list_section = StringSplit(Section, " "); - for (std::vector<std::string>::const_iterator I = list_dist.begin(); - I != list_dist.end(); I++) + + for (std::vector<std::string>::const_iterator U = list_uris.begin(); + U != list_uris.end(); U++) { - for (std::vector<std::string>::const_iterator J = list_section.begin(); - J != list_section.end(); J++) + std::string URI = (*U); + if (!FixupURI(URI)) + { + _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); + return false; + } + + for (std::vector<std::string>::const_iterator I = list_dist.begin(); + I != list_dist.end(); I++) + { + for (std::vector<std::string>::const_iterator J = list_section.begin(); + J != list_section.end(); J++) { if (CreateItem(List, URI, (*I), (*J), Options) == false) { return false; } } + } } return true; } @@ -286,7 +312,7 @@ bool pkgSourceList::Read(string File) /* */ bool pkgSourceList::ReadAppend(string File) { - if (_config->FindB("APT::Sources::Use-Deb822", true) == true) + if (_config->FindB("APT::Sources::Use-Deb822", false) == true) { int lines_parsed =ParseFileDeb822(File); if (lines_parsed < 0) @@ -376,21 +402,26 @@ int pkgSourceList::ParseFileDeb822(string File) // read step by step while (Sources.Step(Tags) == true) { - if(!Tags.Exists("Type")) + if(!Tags.Exists("Types")) continue; - string const type = Tags.FindS("Type"); - Type *Parse = Type::GetType(type.c_str()); - if (Parse == 0) + string const types = Tags.FindS("Types"); + std::vector<std::string> list_types = StringSplit(types, " "); + for (std::vector<std::string>::const_iterator I = list_types.begin(); + I != list_types.end(); I++) { - _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str()); - return -1; - } + Type *Parse = Type::GetType((*I).c_str()); + if (Parse == 0) + { + _error->Error(_("Type '%s' is not known on stanza %u in source list %s"), (*I).c_str(),i,Fd.Name().c_str()); + return -1; + } - if (!Parse->ParseStanza(SrcList, Tags, i, Fd)) - return -1; + if (!Parse->ParseStanza(SrcList, Tags, i, Fd)) + return -1; - i++; + i++; + } } // we are done, return the number of stanzas read