#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>
/*}}}*/
return true;
}
/*}}}*/
+bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
+ pkgTagSection &Tags,
+ int i,
+ FileFd &Fd)
+{
+ map<string, string> Options;
+
+ string Enabled = Tags.FindS("Enabled");
+ if (Enabled.size() > 0 && StringToBool(Enabled) == false)
+ return true;
+
+ // Define external/internal options
+ const char* option_deb822[] = {
+ "Architectures", "Architectures-Add", "Architectures-Remove", "Trusted",
+ };
+ const char* option_internal[] = {
+ "arch", "arch+", "arch-", "trusted",
+ };
+ for (unsigned int j=0; j < sizeof(option_deb822)/sizeof(char*); j++)
+ if (Tags.Exists(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 U = list_uris.begin();
+ U != list_uris.end(); ++U)
+ {
+ 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;
+}
+
// Type::ParseLine - Parse a single line /*{{{*/
// ---------------------------------------------------------------------
/* This is a generic one that is the 'usual' format for sources.list
/* */
bool pkgSourceList::ReadAppend(string File)
{
- if (_config->FindB("APT::Sources::Use-Deb822", true) == true)
- if (ParseFileDeb822(File))
+ if (_config->FindB("APT::Sources::Use-Deb822", false) == true)
+ {
+ int lines_parsed =ParseFileDeb822(File);
+ if (lines_parsed < 0)
+ return false;
+ else if (lines_parsed > 0)
return true;
+ // no lines parsed ... fall through and use old style parser
+ }
return ParseFileOldStyle(File);
}
{
// Open the stream for reading
ifstream F(File.c_str(),ios::in /*| ios::nocreate*/);
- if (!F != 0)
+ if (F.fail() == true)
return _error->Errno("ifstream::ifstream",_("Opening %s"),File.c_str());
// CNC:2003-12-10 - 300 is too short.
/*}}}*/
// SourceList::ParseFileDeb822 - Parse deb822 style sources.list /*{{{*/
// ---------------------------------------------------------------------
-/* */
-bool pkgSourceList::ParseFileDeb822(string File)
+/* Returns: the number of stanzas parsed*/
+int pkgSourceList::ParseFileDeb822(string File)
{
-
pkgTagSection Tags;
- map<string, string> Options;
unsigned int i=0;
// see if we can read the file
if (_error->PendingError() == true)
{
_error->RevertToStack();
- return false;
+ return 0;
}
_error->MergeWithStack();
// 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)
- return _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str());
+ 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)
+ {
+ 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;
+ }
- string URI = Tags.FindS("URL");
- if (!Parse->FixupURI(URI))
- return _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
-
- string Dist = Tags.FindS("Dist");
- Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
+ if (!Parse->ParseStanza(SrcList, Tags, i, Fd))
+ return -1;
- // check if there are any options we support
- const char* option_str[] = {
- "arch", "arch+", "arch-", "trusted" };
- for (unsigned int j=0; j < sizeof(option_str)/sizeof(char*); j++)
- if (Tags.Exists(option_str[j]))
- Options[option_str[j]] = Tags.FindS(option_str[j]);
-
- // now create one item per section
- string const Section = Tags.FindS("Section");
- std::vector<std::string> list;
- if (Section.find(","))
- list = StringSplit(Section, ",");
- else
- list = StringSplit(Section, " ");
- for (std::vector<std::string>::const_iterator I = list.begin();
- I != list.end(); I++)
- Parse->CreateItem(SrcList, URI, Dist, (*I), Options);
-
- i++;
+ i++;
+ }
}
- // we are done
- if(i>0)
- return true;
-
- return false;
+ // we are done, return the number of stanzas read
+ return i;
}
/*}}}*/
// SourceList::FindIndex - Get the index associated with a file /*{{{*/
projects / apt.git / blobdiff