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

add Description tag for deb822 sources

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

+ 4 - 0
doc/sources.list.5.xml

@@ -87,6 +87,8 @@
      URI: http://example.com
      URI: http://example.com
      Suites: stable
      Suites: stable
      Sections: component1 component2
      Sections: component1 component2
+     Description: short
+      long long long
      [option1]: [option1-value]
      [option1]: [option1-value]
 
 
      Type: deb-src
      Type: deb-src
@@ -94,6 +96,8 @@
      Suites: stable
      Suites: stable
      Sections: component1 component2
      Sections: component1 component2
      [option1]: [option1-value]
      [option1]: [option1-value]
+     Description: short
+      long long long
    </literallayout>
    </literallayout>
    </para>
    </para>
 
 

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

@@ -23,12 +23,11 @@ Type: deb
 URI: http://ftp.debian.org/debian
 URI: http://ftp.debian.org/debian
 Suites: stable
 Suites: stable
 Sections: main
 Sections: main
-Comment: Some random string
- that can be very long"
+Description: summay
+ and the long part"
 
 
 # simple case
 # simple case
 echo "$BASE"  > $SOURCES
 echo "$BASE"  > $SOURCES
-
 testequalwithmsg "Simple deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
 testequalwithmsg "Simple deb822 sources.list works" "'http://ftp.debian.org/debian/dists/stable/main/binary-i386/Packages.bz2' ftp.debian.org_debian_dists_stable_main_binary-i386_Packages 0 :
 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
 'http://ftp.debian.org/debian/dists/stable/main/i18n/Translation-en.bz2' ftp.debian.org_debian_dists_stable_main_i18n_Translation-en 0 :
 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 "  aptget update --print-uris 
 'http://ftp.debian.org/debian/dists/stable/InRelease' ftp.debian.org_debian_dists_stable_InRelease 0 "  aptget update --print-uris 
@@ -75,3 +74,4 @@ Suites: stable
 
 
 testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse)
 testequalwithmsg "Invalid deb822 sources.list file gives proper error" "E: Malformed stanza 0 in source list $TMPWORKINGDIRECTORY/rootdir/etc/apt/sources.list (URI parse)
 E: The list of sources could not be read."  aptget update --print-uris
 E: The list of sources could not be read."  aptget update --print-uris
+

+ 2 - 2
test/libapt/sourcelist_test.cc

@@ -26,8 +26,8 @@ int main(int argc, char *argv[])
       "URI: http://ftp.debian.org/debian\n"
       "URI: http://ftp.debian.org/debian\n"
       "Suites: stable\n"
       "Suites: stable\n"
       "Sections: main\n"
       "Sections: main\n"
-      "Comment: Some random string\n"
-      " that can be very long\n"
+      "Description: short\n"
+      " long description 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"