[lintian] 01/01: Prevent some false-positives in udevadm-called-without-guard.
This is an automated email from the git hooks/post-receive script.
lamby pushed a commit to branch master
in repository lintian.
commit 49d1e0205dea08aea0b965424f2169a423b50e75
Author: Chris Lamb <lamby@debian.org>
Date: Fri Feb 16 15:08:15 2018 +0000
Prevent some false-positives in udevadm-called-without-guard.
---
checks/scripts.pm | 2 +-
debian/changelog | 2 ++
.../debian/debian/postrm | 14 ++++++++++++++
.../debian/debian/prerm | 14 ++++++++++++++
t/tests/scripts-udevadm-called-without-guard/tags | 2 ++
5 files changed, 33 insertions(+), 1 deletion(-)
diff --git a/checks/scripts.pm b/checks/scripts.pm
index 7021610..8fcc1d0 100644
--- a/checks/scripts.pm
+++ b/checks/scripts.pm
@@ -715,8 +715,8 @@ sub run {
$seen_helper_cmds{$cmd}{$file} = 1;
}
+ $saw_udevadm_guard = 1 if m/\b(if|which|command)\s+.*udevadm/g;
if (m,$LEADIN(?:/bin/)?udevadm\s, and $saw_sete) {
- $saw_udevadm_guard = 1 if m/\bif\s+/g;
tag 'udevadm-called-without-guard', "$file:$."
unless $saw_udevadm_guard or m/\|\|/;
}
diff --git a/debian/changelog b/debian/changelog
index 2cbe910..4a7095a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,8 @@ lintian (2.5.76) UNRELEASED; urgency=medium
+ [CL] Update override_dh_auto_test-does-not-check-DEB_BUILD_OPTIONS
to fix a number of false positives. Thanks to Gregor Herrmann for
the report. (Closes: #890537)
+ * checks/scripts.pm:
+ + [CL] Prevent some false-positives in udevadm-called-without-guard.
* debian/source/lintian-overrides:
+ [CL] Drop all the overrides for Lintian titself now that we use the
diff --git a/t/tests/scripts-udevadm-called-without-guard/debian/debian/postrm b/t/tests/scripts-udevadm-called-without-guard/debian/debian/postrm
new file mode 100644
index 0000000..445cfe2
--- /dev/null
+++ b/t/tests/scripts-udevadm-called-without-guard/debian/debian/postrm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+udevadm positive
+
+if [ "$1" = "configure" -o "$1" = "upgrade" ] && command -V udevadm >/dev/null 2>&1
+then
+ udevadm false-positive
+fi
+
+exit 0
diff --git a/t/tests/scripts-udevadm-called-without-guard/debian/debian/prerm b/t/tests/scripts-udevadm-called-without-guard/debian/debian/prerm
new file mode 100644
index 0000000..d0d4d19
--- /dev/null
+++ b/t/tests/scripts-udevadm-called-without-guard/debian/debian/prerm
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+#DEBHELPER#
+
+udevadm positive
+
+if which udevadm >/dev/null 2>&1
+then
+ udevadm false-positive
+fi
+
+exit 0
diff --git a/t/tests/scripts-udevadm-called-without-guard/tags b/t/tests/scripts-udevadm-called-without-guard/tags
index 9db7f0f..a32cb52 100644
--- a/t/tests/scripts-udevadm-called-without-guard/tags
+++ b/t/tests/scripts-udevadm-called-without-guard/tags
@@ -1,2 +1,4 @@
W: scripts-udevadm-called-without-guard: maintainer-script-ignores-errors preinst
W: scripts-udevadm-called-without-guard: udevadm-called-without-guard postinst:7
+W: scripts-udevadm-called-without-guard: udevadm-called-without-guard postrm:7
+W: scripts-udevadm-called-without-guard: udevadm-called-without-guard prerm:7
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: