]> git.saurik.com Git - apt.git/commitdiff
add Description tag for deb822 sources
authorMichael Vogt <mvo@debian.org>
Mon, 20 Jan 2014 06:43:17 +0000 (07:43 +0100)
committerMichael Vogt <mvo@debian.org>
Mon, 20 Jan 2014 06:50:46 +0000 (07:50 +0100)
doc/sources.list.5.xml
test/integration/test-apt-sources-deb822
test/libapt/sourcelist_test.cc

index 87f4d5fc5cfa18b85e9cedd181d04a0508a7de88..b2b682292242cf2b40cf7ad277ceb93363eeb187 100644 (file)
@@ -87,6 +87,8 @@
      URI: http://example.com
      Suites: stable
      Sections: component1 component2
+     Description: short
+      long long long
      [option1]: [option1-value]
 
      Type: deb-src
@@ -94,6 +96,8 @@
      Suites: stable
      Sections: component1 component2
      [option1]: [option1-value]
+     Description: short
+      long long long
    </literallayout>
    </para>
 
index c73b942d433a781859c7e2d78776b56129b7ae3d..34708d2d166ec2f22a0b25873175c47bfd5eb33d 100755 (executable)
@@ -23,12 +23,11 @@ Type: deb
 URI: http://ftp.debian.org/debian
 Suites: stable
 Sections: main
-Comment: Some random string
that can be very long"
+Description: summay
and the long part"
 
 # simple case
 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 :
 '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 
@@ -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)
 E: The list of sources could not be read."  aptget update --print-uris
+
index ae5d11f6602c87039d4657e01eec088663693843..b9dd47207d6add9734c38bec64a6223de8bac6e8 100644 (file)
@@ -26,8 +26,8 @@ int main(int argc, char *argv[])
       "URI: http://ftp.debian.org/debian\n"
       "Suites: stable\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"
       "Type: deb\n"
       "URI: http://ftp.debian.org/debian\n"