[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.6-22-gec4e5cb



The following commit has been merged in the master branch:
commit ec4e5cbf5ceea35db5948be21d3b03d696607b0f
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Mar 25 09:09:40 2012 +0200

    deb-format: Generalize (and rename) udeb compression tag
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/deb-format b/checks/deb-format
index e021aff..5e946b7 100644
--- a/checks/deb-format
+++ b/checks/deb-format
@@ -75,8 +75,8 @@ if ($success) {
         tag 'malformed-deb-archive',
             "third member $members[2] not data.tar.(gz|bz2|xz)";
     } else {
-        if ($type eq 'udeb' && $members[2] ne 'data.tar.gz') {
-            tag 'udeb-uses-non-gzip-data-tarball';
+        if ($type eq 'udeb' && $members[2] !~ m/^data\.tar\.[gx]z$/) {
+            tag 'udeb-uses-unsupported-compression-for-data-tarball';
         } elsif ($members[2] eq 'data.tar.xz') {
             my $rel = $info->relation('pre-depends');
             tag 'data.tar.xz-member-without-dpkg-pre-depends'
diff --git a/checks/deb-format.desc b/checks/deb-format.desc
index d4d8270..f070cef 100644
--- a/checks/deb-format.desc
+++ b/checks/deb-format.desc
@@ -39,13 +39,15 @@ Info: tar produced an error while listing the contents of the data
  member of this package.  This probably means there's something broken or
  at least strange about the way the package was constructed.
 
-Tag: udeb-uses-non-gzip-data-tarball
+Tag: udeb-uses-unsupported-compression-for-data-tarball
 Severity: serious
 Certainty: certain
-Info: This udeb contains non-gzip data tarballs.  udpkg,
- debian-installer's dpkg equivalent, does not support non-gzip
- tarballs which means udebs that contain them will not be
- installable. This can also break the daily or weekly d-i images.
+Info: The data tarball of this udeb package is not compressed in format
+ that udpkg (debian-installer's dpkg equivalent) does not support.  Thus
+ the udeb is likely to be uninstallable and could break daily or weekly
+ d-i images.
+ .
+ Currently, udpkg supports .gz and .xz compressed tarballs.
 
 Tag: data.tar.xz-member-without-dpkg-pre-depends
 Severity: pedantic
diff --git a/data/output/ftp-master-fatal b/data/output/ftp-master-fatal
index dcb7b6e..b785096 100644
--- a/data/output/ftp-master-fatal
+++ b/data/output/ftp-master-fatal
@@ -58,7 +58,7 @@ section-is-dh_make-template
 source-field-does-not-match-pkg-name
 symlink-has-too-many-up-segments
 too-many-architectures
-udeb-uses-non-gzip-data-tarball
+udeb-uses-unsupported-compression-for-data-tarball
 uploader-address-is-on-localhost
 uploader-address-malformed
 uploader-name-missing
diff --git a/debian/changelog b/debian/changelog
index 58e774a..a7ff94c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 lintian (2.5.7) UNRELEASED; urgency=low
 
   * Summary of tag changes:
+    + Added:
+      - udeb-uses-unsupported-compression-for-data-tarball
     + Removed:
       - ancient-dpkg-long-filenames-check
       - ancient-dpkg-predepends-check
@@ -18,11 +20,15 @@ lintian (2.5.7) UNRELEASED; urgency=low
       - package-installs-font-to-usr-x11r6
       - package-uses-obsolete-file
       - postinst-should-not-set-usr-doc-link
+      - udeb-uses-non-gzip-data-tarball
       - x11-games-should-be-in-usr-games
 
   * checks/*:
     + [NT] Remove some old tags that are no longer useful.
       (Closes: #663516)
+  * checks/deb-format{,.desc}:
+    + [NT] Replace old udeb compression tag with a more general
+      one.  (Closes: #664600)
   * checks/files{,.desc}:
     + [NT] Remove "manual" lazy loads of data files.
     + [NT] Remove code for the uses-FHS-doc-dir tag.
diff --git a/profiles/debian/ftp-master-auto-reject.profile b/profiles/debian/ftp-master-auto-reject.profile
index 13f5ef4..845d37b 100644
--- a/profiles/debian/ftp-master-auto-reject.profile
+++ b/profiles/debian/ftp-master-auto-reject.profile
@@ -33,9 +33,9 @@ Enable-Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, arch-dependent-file-in-usr-sh
  preinst-interpreter-without-predepends, section-is-dh_make-template,
  source-field-does-not-match-pkg-name, statically-linked-binary,
  symlink-has-too-many-up-segments, too-many-architectures,
- udeb-uses-non-gzip-data-tarball, uploader-address-is-on-localhost,
- uploader-address-malformed, uploader-name-missing,
- usr-share-doc-symlink-to-foreign-package,
+ udeb-uses-unsupported-compression-for-data-tarball,
+ uploader-address-is-on-localhost, uploader-address-malformed,
+ uploader-name-missing, usr-share-doc-symlink-to-foreign-package,
  usr-share-doc-symlink-without-dependency, wrong-file-owner-uid-or-gid
 
 Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, bad-package-name, bad-relation, bad-version-number,
@@ -62,8 +62,8 @@ Tags: FSSTND-dir-in-usr, FSSTND-dir-in-var, bad-package-name, bad-relation, bad-
  package-not-lowercase, package-uses-local-diversion,
  section-is-dh_make-template, source-field-does-not-match-pkg-name,
  symlink-has-too-many-up-segments, too-many-architectures,
- udeb-uses-non-gzip-data-tarball, uploader-address-is-on-localhost,
- uploader-address-malformed, uploader-name-missing,
- usr-share-doc-symlink-to-foreign-package
+ udeb-uses-unsupported-compression-for-data-tarball,
+ uploader-address-is-on-localhost, uploader-address-malformed,
+ uploader-name-missing, usr-share-doc-symlink-to-foreign-package
 Overridable: no
 
diff --git a/t/tests/deb-format-udeb-compression/desc b/t/tests/deb-format-udeb-compression/desc
index f04ef7c..f84136a 100644
--- a/t/tests/deb-format-udeb-compression/desc
+++ b/t/tests/deb-format-udeb-compression/desc
@@ -2,4 +2,4 @@ Testname: deb-format-udeb-compression
 Sequence: 6000
 Version: 1.0
 Description: Test of compression of udeb data member
-Test-For: udeb-uses-non-gzip-data-tarball
\ No newline at end of file
+Test-For: udeb-uses-unsupported-compression-for-data-tarball
diff --git a/t/tests/deb-format-udeb-compression/tags b/t/tests/deb-format-udeb-compression/tags
index 52e036a..35e9241 100644
--- a/t/tests/deb-format-udeb-compression/tags
+++ b/t/tests/deb-format-udeb-compression/tags
@@ -1 +1 @@
-E: some-udeb udeb: udeb-uses-non-gzip-data-tarball
+E: some-udeb udeb: udeb-uses-unsupported-compression-for-data-tarball

-- 
Debian package checker


Reply to: