diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-18 08:52:02 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-18 08:52:02 +0100 |
| commit | 24a48afaaea7e6206ced99a13a45f38366231280 (patch) | |
| tree | cd5735e8b24ac553f4c260770d7dea7a9b43ae67 | |
| parent | 47d7761243a02368bb60b7227bd05a19ca4660d1 (diff) | |
| parent | 866e9fadf892368fcb50e6a192bcdd350cfe8e5c (diff) | |
Merge remote-tracking branch 'mvo/feature/source-deb822' into debian/experimental-no-abi-break
| -rw-r--r-- | apt-pkg/sourcelist.cc | 4 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 4 | ||||
| -rwxr-xr-x | test/integration/test-apt-sources-deb822 | 2 | ||||
| -rw-r--r-- | test/libapt/sourcelist_test.cc | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index 09d8287a0..51b766095 100644 --- a/apt-pkg/sourcelist.cc +++ b/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", diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index e770023d5..7a82bd4ce 100644 --- a/doc/sources.list.5.xml +++ b/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] diff --git a/test/integration/test-apt-sources-deb822 b/test/integration/test-apt-sources-deb822 index 758ae5ae3..a3855496c 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -13,7 +13,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 diff --git a/test/libapt/sourcelist_test.cc b/test/libapt/sourcelist_test.cc index bf61746c4..b8658ccf1 100644 --- a/test/libapt/sourcelist_test.cc +++ b/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" ; |