This is an automated email from the git hooks/post-receive script. lamby pushed a commit to branch master in repository lintian.
commit 280a629e56bce48d3d2eaeb3c4a5595aa054a9dd Author: Chris Lamb <la...@debian.org> Date: Sun Aug 13 11:36:19 2017 -0700 Revert "Check for missing calls to dpkg-maintscript-helper(1) in maintainer scripts. (Closes: #XXXXXX)" This reverts commit f209dc9e94c29a60a330c4307315a589396c43ce. --- checks/scripts.desc | 8 -------- checks/scripts.pm | 19 +------------------ debian/changelog | 2 -- .../debian/debian/postinst | 9 --------- .../debian/debian/preinst | 9 --------- .../desc | 5 ----- .../tags | 1 - 7 files changed, 1 insertion(+), 52 deletions(-) diff --git a/checks/scripts.desc b/checks/scripts.desc index 8a5b6bb..f5fe1b2 100644 --- a/checks/scripts.desc +++ b/checks/scripts.desc @@ -375,14 +375,6 @@ Info: The maintainer script seems to call dpkg-maintscript-helper package uninstallable. Ref: dpkg-maintscript-helper(1) -Tag: missing-call-to-dpkg-maintscript-helper -Severity: serious -Certainty: certain -Info: The maintainer script is missing a call to the specified - dpkg-maintscript-helper command which requires coordinated actions from - several maintainer scripts. -Ref: dpkg-maintscript-helper(1) - Tag: maintainer-script-removes-device-files Severity: serious Certainty: certain diff --git a/checks/scripts.pm b/checks/scripts.pm index d118dea..1b098d0 100644 --- a/checks/scripts.pm +++ b/checks/scripts.pm @@ -231,7 +231,7 @@ sub script_tag { sub run { my ($pkg, undef, $info) = @_; - my (%executable, %ELF, %scripts, %seen_helper_cmds); + my (%executable, %ELF, %scripts); # no dependency for install-menu, because the menu package specifically # says not to depend on it. @@ -684,12 +684,6 @@ sub run { $saw_statoverride_list = 1 if /--list/; } - if (m,$LEADIN(?:/usr/bin/)?dpkg-maintscript-helper\s(\S+),) { - my $cmd = $1; - $seen_helper_cmds{$cmd} = () unless $seen_helper_cmds{$cmd}; - $seen_helper_cmds{$cmd}{$file} = 1; - } - if ( m,[^\w](?:(?:/var)?/tmp|\$TMPDIR)/[^)\]}\s], and not m/\bmks?temp\b/ and not m/\btempfile\b/ @@ -1026,17 +1020,6 @@ sub run { } close($ctrl_fd); - for my $cmd (qw(rm_conffile mv_conffile symlink_to_dir)) { - next unless $seen_helper_cmds{$cmd}; - - # dpkg-maintscript-helper(1) recommends the snippets are in all - # maintainer scripts but they are not strictly required in prerm. - for my $file (qw(preinst postinst postrm)) { - tag 'missing-call-to-dpkg-maintscript-helper', "$file ($cmd)" - unless $seen_helper_cmds{$cmd}{$file}; - } - } - # If any of the maintainer scripts used a variable in the file or # diversion name normalise them all if ($expand_diversions) { diff --git a/debian/changelog b/debian/changelog index 6a96ea9..866037a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -59,8 +59,6 @@ lintian (2.5.53) UNRELEASED; urgency=medium + [CL] Correct false positives in unconditional-use-of-dpkg-statoverride by detecting "if !" as a valid shell prefix. (Closes: #869587) - + [CL] Check for missing calls to dpkg-maintscript-helper(1) in - maintainer scripts. (Closes: #XXXXXX) * checks/testsuite.{desc,pm}: + [CL] Remove recommendations to add a "Testsuite: autopkgtest" field to debian/control as it is added when needed by dpkg-source(1) diff --git a/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/debian/debian/postinst b/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/debian/debian/postinst deleted file mode 100644 index fb6d516..0000000 --- a/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/debian/debian/postinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -dpkg-maintscript-helper symlink_to_dir /path/name /old/target 1.0-1 scripts-missing-call-to-dpkg-maintscript-helper - -exit 0 diff --git a/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/debian/debian/preinst b/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/debian/debian/preinst deleted file mode 100644 index fb6d516..0000000 --- a/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/debian/debian/preinst +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -dpkg-maintscript-helper symlink_to_dir /path/name /old/target 1.0-1 scripts-missing-call-to-dpkg-maintscript-helper - -exit 0 diff --git a/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/desc b/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/desc deleted file mode 100644 index 39473f1..0000000 --- a/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/desc +++ /dev/null @@ -1,5 +0,0 @@ -Testname: scripts-missing-call-to-dpkg-maintscript-helper -Version: 1.0 -Description: Test for packages that miss calls to dpkg-maintscript-helper(1) -Test-For: - missing-call-to-dpkg-maintscript-helper diff --git a/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/tags b/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/tags deleted file mode 100644 index 488eefb..0000000 --- a/t/tests/scripts-missing-call-to-dpkg-maintscript-helper/tags +++ /dev/null @@ -1 +0,0 @@ -E: scripts-missing-call-to-dpkg-maintscript-helper: missing-call-to-dpkg-maintscript-helper postrm (symlink_to_dir) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git