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

[SCM] Debian package checker branch, master, updated. 2.5.10-36-gfe2a311

The following commit has been merged in the master branch:
commit fe2a3110ca229188ed5b7f07b4bca76b0b6201ba
Author: Niels Thykier <niels@thykier.net>
Date:   Fri Jul 13 16:30:00 2012 +0200

    c/scripts: Retire check for dpkg-maintscript-helper in preinst
    
    dpkg in stable releases of Debian and Ubuntu currectly has proper
    support so the Pre-Depends relation is no longer needed.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/scripts b/checks/scripts
index 8a770ec..3f7c203 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -770,12 +770,6 @@ while (<SCRIPTS>) {
         if (m,\bsuidregister\b,) {
             tag 'suidregister-used-in-maintainer-script', $file;
         }
-        if ($file eq 'preinst') {
-            if (m/^\s*dpkg-maintscript-helper(?:\s|\z)/ &&
-                    !$info->relation('pre-depends')->implies('dpkg (>= 1.15.7.2~)')) {
-                tag 'preinst-uses-dpkg-maintscript-helper-without-predepends', "$file:$.";
-            }
-        }
         if ($file eq 'postrm') {
             if (m,update\-alternatives \-\-remove,) {
                 tag 'update-alternatives-remove-called-in-postrm';
diff --git a/checks/scripts.desc b/checks/scripts.desc
index 9895c83..ccfcb16 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -157,14 +157,6 @@ Info: The package contains a <tt>preinst</tt> maintainer script that uses
  section 3.5).
 Ref: policy 7.2
 
-Tag: preinst-uses-dpkg-maintscript-helper-without-predepends
-Severity: pedantic
-Certainty: possible
-Info: The package contains a <tt>preinst</tt> maintainer script that
- uses <tt>dpkg-maintscript-helper</tt> but does not declare a
- versoned pre-dependency on <tt>dpkg (&gt;= 1.15.7.2~)</tt> that provides that
- script.
-
 Tag: control-interpreter-without-depends
 Severity: serious
 Certainty: possible
diff --git a/debian/changelog b/debian/changelog
index 6cc29d8..7c0b639 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ lintian (2.5.11) UNRELEASED; urgency=low
     + Removed:
       - apparently-truncated-elf-binary
       - data.tar.xz-member-without-dpkg-pre-depends
+      - preinst-uses-dpkg-maintscript-helper-without-predepends
 
   * checks/*:
     + [NT] Remove assumption that lintian will chdir into the
@@ -30,6 +31,8 @@ lintian (2.5.11) UNRELEASED; urgency=low
       setting MANROFFSEQ to the empty string when calling man.
     + [CW,NT] Pass -Tutf8 -Z to man to skip an unused part of
       the groff pipeline.
+  * checks/scripts{,.desc}:
+    + [NT] Retire check for dpkg-maintscript-helper in preinst.
   * checks/source-copyright{,.desc}:
     + [NT] Check for possible misspellings of known field
       names.  (Closes: #678639)
diff --git a/profiles/ubuntu/main.profile b/profiles/ubuntu/main.profile
index 8df51be..6cb4bc0 100644
--- a/profiles/ubuntu/main.profile
+++ b/profiles/ubuntu/main.profile
@@ -11,7 +11,5 @@ Disable-Tags: changelog-should-mention-nmu,
  uploader-address-causes-mail-loops-or-bounces,
  upstart-job-in-etc-init.d-not-registered-via-update-rc.d
 
-# Serious as it may break Lucid upgrade path
-Tags: preinst-uses-dpkg-maintscript-helper-without-predepends
-Severity: serious
+
 
diff --git a/t/COVERAGE b/t/COVERAGE
index 7f5d369..d094302 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
 Last generated 2012-07-13
-Coverage: 831/964 (86.20%), w. legacy tests: 931/964 (96.58%)
+Coverage: 830/963 (86.19%), w. legacy tests: 930/963 (96.57%)
 
 The following tags are not tested by the test suite:
 
diff --git a/t/tests/scripts-maintainer-general/debian/debian/preinst b/t/tests/scripts-maintainer-general/debian/debian/preinst
deleted file mode 100644
index 2734464..0000000
--- a/t/tests/scripts-maintainer-general/debian/debian/preinst
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/sh
-
-set -e
-
-dpkg-maintscript-helper mv_conf some arguments
-
-#DEBHELPER#
diff --git a/t/tests/scripts-maintainer-general/desc b/t/tests/scripts-maintainer-general/desc
index 20045f1..3e21ef4 100644
--- a/t/tests/scripts-maintainer-general/desc
+++ b/t/tests/scripts-maintainer-general/desc
@@ -23,8 +23,7 @@ Test-For:
  maintainer-shell-script-fails-syntax-check
  mknod-in-maintainer-script
  possibly-insecure-handling-of-tmp-files-in-maintainer-script
- preinst-uses-dpkg-maintscript-helper-without-predepends
  read-in-maintainer-script
  start-stop-daemon-in-maintainer-script
  suidregister-used-in-maintainer-script
-References: Debian Bug#532984, Debian Bug#602249
+References: Debian Bug#532984
diff --git a/t/tests/scripts-maintainer-general/tags b/t/tests/scripts-maintainer-general/tags
index c93a8ee..5dbdee4 100644
--- a/t/tests/scripts-maintainer-general/tags
+++ b/t/tests/scripts-maintainer-general/tags
@@ -9,7 +9,6 @@ E: scripts-maintainer-general: maintainer-script-modifies-netbase-managed-file p
 E: scripts-maintainer-general: maintainer-script-uses-dpkg-status-directly postinst
 E: scripts-maintainer-general: maintainer-shell-script-fails-syntax-check prerm
 E: scripts-maintainer-general: mknod-in-maintainer-script postinst:125
-E: scripts-maintainer-general: preinst-uses-dpkg-maintscript-helper-without-predepends preinst:5
 E: scripts-maintainer-general: read-in-maintainer-script postinst:10
 E: scripts-maintainer-general: suidregister-used-in-maintainer-script postinst
 W: scripts-maintainer-general: command-with-path-in-maintainer-script postinst:117 /usr/bin/foo

-- 
Debian package checker
Reply to: