* refactor to have a new virtual ParseStanza

Have a similar ParseStanza() to the current ParseLine().
Rename the Architectures options in deb822 to make it more
user friendly

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 42ada7e18ed0f94a5ef499caf866a7bde2d5273a..fe0eace07f5134c0d0988f358ca8bd876ddbd955 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -71,6 +71,44 @@ 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("URL");
+   if (!FixupURI(URI))
+   {
+      _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
+      return false;
+   }
+   
+   string Dist = Tags.FindS("Dist");
+   Dist = SubstVar(Dist,"$(ARCH)",_config->Find("APT::Architecture"));
+   
+   // Define external/internal options
+   const char* option_deb822[] = { 
+      "Architectures", "Architectures-Add", "Architectures-Delete", "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 section
+   string const Section = Tags.FindS("Section");
+   std::vector<std::string> list = StringSplit(Section, " ");
+   for (std::vector<std::string>::const_iterator I = list.begin();
+        I != list.end(); I++)
+      return CreateItem(List, URI, Dist, (*I), Options);
+   
+   return true;
+}
+
 // Type::ParseLine - Parse a single line                               /*{{{*/
 // ---------------------------------------------------------------------
 /* This is a generic one that is the 'usual' format for sources.list
@@ -313,7 +351,6 @@ bool pkgSourceList::ParseFileOldStyle(string File)
 int pkgSourceList::ParseFileDeb822(string File)
 {
    pkgTagSection Tags;
-   map<string, string> Options;
    unsigned int i=0;
 
    // see if we can read the file
@@ -338,35 +375,11 @@ int pkgSourceList::ParseFileDeb822(string File)
       if (Parse == 0)
       {
          _error->Error(_("Type '%s' is not known on stanza %u in source list %s"),type.c_str(),i,Fd.Name().c_str());
-         // true means we do not retry with old-style sources.list
          return -1;
       }
          
-      string URI = Tags.FindS("URL");
-      if (!Parse->FixupURI(URI))
-      {
-         _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
-         // means we do not retry with old-style sources.list
+      if (!Parse->ParseStanza(SrcList, Tags, i, Fd))
          return -1;
-      }
-
-      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 = StringSplit(Section, " ");
-      for (std::vector<std::string>::const_iterator I = list.begin();
-           I != list.end(); I++)
-         Parse->CreateItem(SrcList, URI, Dist, (*I), Options);
 
       i++;
    }

diff --git a/apt-pkg/sourcelist.h b/apt-pkg/sourcelist.h
index d83c76d6affbe22baff7d509ee95be6c39f5d769..0ccb4aa0052c8f7311ac4b14d778207e5df6d892 100644 (file)
--- a/apt-pkg/sourcelist.h
+++ b/apt-pkg/sourcelist.h
@@ -31,6 +31,7 @@
 #include <vector>
 #include <map>
 #include <apt-pkg/pkgcache.h>
+#include <apt-pkg/tagfile.h>
 
 #ifndef APT_8_CLEANER_HEADERS
 #include <apt-pkg/metaindex.h>
@@ -60,6 +61,10 @@ class pkgSourceList
       const char *Label;
 
       bool FixupURI(std::string &URI) const;
+      virtual bool ParseStanza(std::vector<metaIndex *> &List,
+                               pkgTagSection &Tags,
+                               int stanza_n,
+                               FileFd &Fd);
       virtual bool ParseLine(std::vector<metaIndex *> &List,
                             const char *Buffer,
                             unsigned long const &CurLine,std::string const &File) const;

diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index b110c14622ee6e24f4219fbd6c5d31df6e07baa8..fcb6010c3b4f35ada295bd9744f6f2fa20b069f7 100755 (executable)
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -48,7 +48,7 @@ testequalwithmsg "Multiple entries in deb822 sources.list work" "'http://ftp.deb
 
 # ARCH option
 echo "$BASE" > $SOURCES
-echo "Arch: amd64,armel" >> $SOURCES
+echo "Architectures: amd64,armel" >> $SOURCES
 
 testequalwithmsg "Arch: option in deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-amd64/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-amd64_Packages 0 :
 'http://ftp.debian.org/debian/dists/stable/main/binary-armel/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-armel_Packages 0 :