Merge remote-tracking branch 'mvo/feature/source-deb822' into debian/experimental...

diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc
index 51b766095edee84fd307e232e8b0cf00df53da9b..4e580ba04f97a515396d9581505fe14366ebf7d8 100644 (file)
--- a/apt-pkg/sourcelist.cc
+++ b/apt-pkg/sourcelist.cc
@@ -97,9 +97,9 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
          Options[option_internal[j]] = Tags.FindS(option_deb822[j]);
    
    // now create one item per suite/section
-   string Suite = Tags.FindS("Suite");
+   string Suite = Tags.FindS("Suites");
    Suite = SubstVar(Suite,"$(ARCH)",_config->Find("APT::Architecture"));
-   string const Section = Tags.FindS("Section");
+   string const Section = Tags.FindS("Sections");
 
    std::vector<std::string> list_dist = StringSplit(Suite, " ");
    std::vector<std::string> list_section = StringSplit(Section, " ");

diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml
index 7a82bd4ce7840a8e38501ed8a80d94554983fd1e..87f4d5fc5cfa18b85e9cedd181d04a0508a7de88 100644 (file)
--- a/doc/sources.list.5.xml
+++ b/doc/sources.list.5.xml
@@ -20,7 +20,7 @@
    &apt-email;
    &apt-product;
    <!-- The last update date -->
-   <date>2012-06-09T00:00:00Z</date>
+   <date>2014-01-18T00:00:00Z</date>
  </refentryinfo>
  
  <refmeta>
@@ -85,14 +85,14 @@
    <literallayout>
      Type: deb
      URI: http://example.com
-     Suite: stable
-     Section: component1 component2
+     Suites: stable
+     Sections: component1 component2
      [option1]: [option1-value]
 
      Type: deb-src
      URI: http://example.com
-     Suite: stable
-     Section: component1 component2
+     Suites: stable
+     Sections: component1 component2
      [option1]: [option1-value]
    </literallayout>
    </para>

diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822
index a3855496c5b1b30608ac75e354bdda6024b0a8b2..6e9a02417c5c64b8134948f9b4918ea0b8474c42 100755 (executable)
--- a/test/integration/test-apt-sources-deb822
+++ b/test/integration/test-apt-sources-deb822
@@ -14,8 +14,8 @@ BASE='# some comment
 
 Type: deb
 URI: http://ftp.debian.org/debian
-Suite: stable
-Section: main
+Suites: stable
+Sections: main
 Comment: Some random string
  that can be very long'
 
@@ -81,7 +81,7 @@ E: The list of sources could not be read."  aptget update --print-uris
 
 msgtest 'Test deb822 sources.list file which has' 'malformed URI'
 echo "Type: deb
-Suite: stable
+Suites: stable
 " > $SOURCES
 testequal --nomsg  "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse)
 E: The list of sources could not be read."  aptget update --print-uris

diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc
index b8658ccf1b55aec321b465c0958e404944c3e467..701eeeaa791644d2c355bbd4bb926f25a480b6ef 100644 (file)
--- a/test/libapt/sourcelist_test.cc
+++ b/test/libapt/sourcelist_test.cc
@@ -24,8 +24,8 @@ int main(int argc, char *argv[])
    const char contents[] = ""
       "Type: deb\n"
       "URI: http://ftp.debian.org/debian\n"
-      "Suite: stable\n"
-      "Section: main\n"
+      "Suites: stable\n"
+      "Sections: main\n"
       "Comment: Some random string\n"
       " that can be very long\n"
       "\n"