Просмотр исходного кода

rename URL to Uri in deb822-sources

Michael Vogt лет назад: 12
Родитель
Сommit
a51fa92c52
3 измененных файлов с 4 добавлено и 4 удалено
  1. 1 1
      apt-pkg/sourcelist.cc
  2. 2 2
      doc/sources.list.5.xml
  3. 1 1
      test/integration/test-apt-sources-deb822

+ 1 - 1
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());

+ 2 - 2
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]

+ 1 - 1
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