diff options
| author | Michael Vogt <mvo@debian.org> | 2014-01-16 17:03:07 +0100 |
|---|---|---|
| committer | Michael Vogt <mvo@debian.org> | 2014-01-16 17:03:07 +0100 |
| commit | a51fa92c521a6790446108a54ad1d9b6a16515ff (patch) | |
| tree | 896238a9a6f4e6833704f736234cd17953b81407 | |
| parent | 796a0eff1acebe858632c344e77bfc3189b2244f (diff) | |
rename URL to Uri in deb822-sources
| -rw-r--r-- | apt-pkg/sourcelist.cc | 2 | ||||
| -rw-r--r-- | doc/sources.list.5.xml | 4 | ||||
| -rwxr-xr-x | test/integration/test-apt-sources-deb822 | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/apt-pkg/sourcelist.cc b/apt-pkg/sourcelist.cc index ddebd206d..0cea8dc7f 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("URL"); + string URI = Tags.FindS("Uri"); if (!FixupURI(URI)) { _error->Error(_("Malformed stanza %u in source list %s (URI parse)"),i,Fd.Name().c_str()); diff --git a/doc/sources.list.5.xml b/doc/sources.list.5.xml index 7a82bd4ce..e770023d5 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 00ca102be..edf52487c 100755 --- a/test/integration/test-apt-sources-deb822 +++ b/test/integration/test-apt-sources-deb822 @@ -20,7 +20,7 @@ BASE="# some comment #Type: meep Type: deb -URL: http://ftp.debian.org/debian +Uri: http://ftp.debian.org/debian Suite: stable Section: main Comment: Some random string |