From 866e9fadf892368fcb50e6a192bcdd350cfe8e5c Mon Sep 17 00:00:00 2001
From: Michael Vogt <mvo@debian.org>
Date: Fri, 17 Jan 2014 20:41:55 +0100
Subject: [PATCH] implement suggestion by donkult (thanks!)
---
apt-pkg/sourcelist.cc | 4 ++--
doc/sources.list.5.xml | 4 ++--
test/integration/test-apt-sources-deb822 | 2 +-
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 67d119565..a055c8d5e 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
-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 1d30bd85b..6a625770f 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"
;
--
2.47.2