[SCM] Debian package checker branch, master, updated. 2.2.14-18-g5d06782
The following commit has been merged in the master branch:
commit 5d0678222e671e56a4e72e580d323bea4854e6e5
Author: Russ Allbery <rra@debian.org>
Date: Sat Sep 12 19:06:35 2009 -0700
Don't warn about dependencies if program is run with || true
* checks/scripts:
+ [RA] Don't warn about missing dependencies on programs if the
program invocation is followed by || true. Thanks, Aurelien Jarno.
(Closes: #541372)
diff --git a/checks/scripts b/checks/scripts
index eb1785b..389636b 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -886,7 +886,7 @@ while (<SCRIPTS>) {
if ($pkg ne $package and /$regex/ and ! $warned{$package}) {
if (m,-x\s+\S*$regex, or m,(which|type)\s+$regex, or m,command\s+.*?$regex,) {
$warned{$package} = 1;
- } else {
+ } elsif (!/\|\|\s*true\b/) {
unless ($info->relation('strong')->implies($package)) {
my $shortpackage = $package;
$shortpackage =~ s/[ \(].*//;
diff --git a/debian/changelog b/debian/changelog
index e63bd97..08e5c84 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,10 @@ lintian (2.2.15) UNRELEASED; urgency=low
+ [RA] When checking for out-of-order debhelper calls, take into
account the -p flag and only check within each package. Thanks,
Michael Koch. (Closes: #545219)
+ * checks/scripts:
+ + [RA] Don't warn about missing dependencies on programs if the
+ program invocation is followed by || true. Thanks, Aurelien Jarno.
+ (Closes: #541372)
* data/fields/essential:
+ [RA] New list of essential packages.
diff --git a/t/tests/scripts-maintainer-general/debian/debian/postinst b/t/tests/scripts-maintainer-general/debian/debian/postinst
index e48a2c5..4b35a09 100755
--- a/t/tests/scripts-maintainer-general/debian/debian/postinst
+++ b/t/tests/scripts-maintainer-general/debian/debian/postinst
@@ -117,4 +117,8 @@ chmod `dpkg-statoverride --list /usr/sbin/apache2 | cut -f 3` /usr/sbin/apache2
true `basename "$0"` `/usr/bin/foo bar`
true `/usr/bin/foo "$0"`
+# This line should not trigger a warning about no dependency on ucf because of
+# the || true. (Bug#541372)
+ucf -p /etc/sensors3.conf || true
+
#DEBHELPER#
--
Debian package checker
Reply to: