fix section adding

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 1261ebb5244d515415c153d046576e7f8d319098..4883e2fabf346e6567d8bcaddd5f75e6015ab056 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -273,7 +273,16 @@ bool pkgSourceList::ReadAppend(string File)
          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]);
          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]);

-         Parse->CreateItem(SrcList, URI, Dist, Section, Options);
+
+         // now create one item per section
+         std::vector<std::string> list;
+         if (Section.find(","))
+             list = StringSplit(Section, ",");
+         else
+             list = StringSplit(Section, " ");
+         for (int i=0; i < list.size(); i++)
+            Parse->CreateItem(SrcList, URI, Dist, list[i], Options);
+

          i++;
       }
       // we are done
          i++;
       }
       // we are done

diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index cdf30c02accab5772a938631b3c44afbecf4f27d..6e9700bb0358814993f00c7b89bc9f899f80f68c 100755 (executable)
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -22,6 +22,16 @@ testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.
 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 "  aptget update --print-uris 
 
 
 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 "  aptget update --print-uris 
 
 

+# two sections (we support both "," and " " as seperator)
+echo "$BASE" | sed s/main/"main,contrib"/ > rootdir/etc/apt/sources.list
+
+testequal "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/contrib/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_contrib_binary-i386_Packages 0 :
+'http://ftp.debian.org/debian/dists/stable/contrib/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_contrib_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
+'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 "  aptget update --print-uris 
+
+

 # Two entries
 echo "$BASE" > rootdir/etc/apt/sources.list
 echo "" >> rootdir/etc/apt/sources.list
 # Two entries
 echo "$BASE" > rootdir/etc/apt/sources.list
 echo "" >> rootdir/etc/apt/sources.list