rename "Suite/Section" to plural

[apt.git] / apt-pkg / sourcelist.cc

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 99cdbe03080b6bdd95bf2a284e8ac78e98add3f0..4e580ba04f97a515396d9581505fe14366ebf7d8 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -71,6 +71,53 @@ bool pkgSourceList::Type::FixupURI(string &URI) const
    return true;
 }
                                                                        /*}}}*/
+bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
+                                      pkgTagSection &Tags,
+                                      int i,
+                                      FileFd &Fd)
+{
+   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;
+   }
+   
+   // 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]))
+         Options[option_internal[j]] = Tags.FindS(option_deb822[j]);
+   
+   // 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");
+
+   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 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
@@ -240,8 +287,14 @@ bool pkgSourceList::Read(string File)
 bool pkgSourceList::ReadAppend(string File)
 {
    if (_config->FindB("APT::Sources::Use-Deb822", true) == true)
-      if (ParseFileDeb822(File))
+   {
+      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);
 }
 
@@ -303,12 +356,10 @@ bool pkgSourceList::ParseFileOldStyle(string File)
                                                                        /*}}}*/
 // 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
@@ -318,7 +369,7 @@ bool pkgSourceList::ParseFileDeb822(string File)
    if (_error->PendingError() == true)
    {
       _error->RevertToStack();
-      return false;
+      return 0;
    }
    _error->MergeWithStack();
    
@@ -331,41 +382,19 @@ bool pkgSourceList::ParseFileDeb822(string File)
       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());
+      {
+         _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.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"));
-
-      // 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);
+      if (!Parse->ParseStanza(SrcList, Tags, i, Fd))
+         return -1;
 
       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                /*{{{*/