Browse Source

rename "Suite/Section" to plural

debian/1.8.y
Michael Vogt 9 years ago
parent
commit
6c069a2247
  1. 4
      apt-pkg/sourcelist.cc
  2. 10
      doc/sources.list.5.xml
  3. 6
      test/integration/test-apt-sources-deb822
  4. 4
      test/libapt/sourcelist_test.cc

4
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, " ");

10
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>

6
test/integration/test-apt-sources-deb822

@ -21,8 +21,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"
@ -70,7 +70,7 @@ testequalwithmsg "Invalid sources.list file gives proper error" "E: Malformed li
E: The list of sources could not be read." aptget update --print-uris
echo "Type: deb
Suite: stable
Suites: stable
" > $SOURCES
testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse)

4
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"

Loading…
Cancel
Save