Browse Source

implement suggestion by donkult (thanks!)

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

4
apt-pkg/sourcelist.cc

@ -78,7 +78,7 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
{
map<string, string> Options;
string URI = Tags.FindS("Uri");
string URI = Tags.FindS("URI");
if (!FixupURI(URI))
{
_error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str());
@ -87,7 +87,7 @@ bool pkgSourceList::Type::ParseStanza(vector<metaIndex *> &List,
// Define external/internal options
const char* option_deb822[] = {
"Architectures", "Architectures-Add", "Architectures-Delete", "Trusted",
"Architectures", "Architectures-Add", "Architectures-Remove", "Trusted",
};
const char* option_internal[] = {
"arch", "arch+", "arch-", "trusted",

4
doc/sources.list.5.xml

@ -84,13 +84,13 @@
<para>Alternatively a rfc822 style format is also supported:
<literallayout>
Type: deb
Uri: http://example.com
URI: http://example.com
Suite: stable
Section: component1 component2
[option1]: [option1-value]
Type: deb-src
Uri: http://example.com
URI: http://example.com
Suite: stable
Section: component1 component2
[option1]: [option1-value]

2
test/integration/test-apt-sources-deb822

@ -20,7 +20,7 @@ BASE="# some comment
#Type: meep
Type: deb
Uri: http://ftp.debian.org/debian
URI: http://ftp.debian.org/debian
Suite: stable
Section: main
Comment: Some random string

4
test/libapt/sourcelist_test.cc

@ -23,14 +23,14 @@ int main(int argc, char *argv[])
{
const char contents[] = ""
"Type: deb\n"
"Uri: http://ftp.debian.org/debian\n"
"URI: http://ftp.debian.org/debian\n"
"Suite: stable\n"
"Section: main\n"
"Comment: Some random string\n"
" that can be very long\n"
"\n"
"Type: deb\n"
"Uri: http://ftp.debian.org/debian\n"
"URI: http://ftp.debian.org/debian\n"
"Suite: unstable\n"
"Section: main non-free\n"
;

Loading…
Cancel
Save