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

implement suggestion by donkult (thanks!)

Michael Vogt лет назад: 12
Родитель
Сommit
866e9fadf8

+ 2 - 2
apt-pkg/sourcelist.cc

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

+ 2 - 2
doc/sources.list.5.xml

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

+ 1 - 1
test/integration/test-apt-sources-deb822

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

+ 2 - 2
test/libapt/sourcelist_test.cc

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