[lintian] 12/15: Rename update-alternatives detection in maintainer script to maintainer-script-should-not-use convention
This is an automated email from the git hooks/post-receive script.
broucaries-guest pushed a commit to branch master
in repository lintian.
commit 844073bfc904824b38aa8ed6ae18e06d93460b1a
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Sat Dec 14 15:29:16 2013 +0100
Rename update-alternatives detection in maintainer script to maintainer-script-should-not-use convention
---
checks/scripts.desc | 4 ++--
data/scripts/maintainer-script-bad-command | 8 ++++----
t/tests/scripts-maintainer-general/desc | 2 ++
t/tests/scripts-maintainer-general/tags | 5 +++--
4 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/checks/scripts.desc b/checks/scripts.desc
index 6c62336..0aafa5e 100644
--- a/checks/scripts.desc
+++ b/checks/scripts.desc
@@ -453,7 +453,7 @@ Info: This script calls update-xmlcatalog, which comes from the xml-core
dh_installxmlcatalogs, add a dependency on ${misc:Depends} and
dh_installxmlcatalogs will take care of this for you.
-Tag: update-alternatives-remove-called-in-postrm
+Tag: maintainer-script-should-not-use-update-alternatives-remove
Severity: normal
Certainty: certain
Info: <tt>update-alternatives --remove <alternative> foo</tt> is
@@ -470,7 +470,7 @@ Info: <tt>update-alternatives --remove <alternative> foo</tt> is
instead.
Ref: policy F, update-alternatives(8)
-Tag: update-alternatives-set-called-in-maintainer-script
+Tag: maintainer-script-should-not-use-update-alternatives-set
Severity: normal
Certainty: certain
Info: <tt>update-alternatives --set <alternative> foo</tt> or
diff --git a/data/scripts/maintainer-script-bad-command b/data/scripts/maintainer-script-bad-command
index 1ecf44b..045431e 100644
--- a/data/scripts/maintainer-script-bad-command
+++ b/data/scripts/maintainer-script-bad-command
@@ -26,6 +26,8 @@ install-info-used-in-maintainer-script ~~ 1 ~~
maintainer-script-removes-device-files ~~ 0 ~~ ~~ ~~^\s*rm\s+(?:[^>]*\s)?(/dev/(?!(?:shm/|\.[^.]+))[^/ ]+)
maintainer-script-should-not-hide-init-failure ~~ 0 ~~ ~~ ~~invoke-rc.d.*\|\| \s+ exit \s+ 0
+maintainer-script-should-not-modify-ld-so-conf ~~ 0 ~~^libc ~~ ~~(?:\A\s*(?:cp|mv)\s+.*\s+|>\s*)/etc/ld\.so\.conf\s*(?:\s|\Z)
+maintainer-script-should-not-modify-netbase-managed-file ~~ 0 ~~ ~~ ~~(?:\A\s*(?:cp|mv)\s+.*\s+|>\s*)(/etc/(?:services|protocols|rpc))\s*(?:\s|\Z)
maintainer-script-should-not-use-adduser-system-without-home ~~ 1 ~~ ~~ ~~adduser\s+--system(?=\s)(?!.*\s--home\s+/(?!home/))
maintainer-script-should-not-use-ancient-dpkg-epoch-check ~~ 0 ~~ ~~ ~~${LEADIN}dpkg\s+--assert-working-epoch\b
maintainer-script-should-not-use-ancient-dpkg-multi-conrep-check~~ 0 ~~ ~~ ~~${LEADIN}dpkg\s+--assert-multi-conrep\b
@@ -34,10 +36,8 @@ maintainer-script-should-not-use-dpkg-status-directly ~~ 1 ~~^(base-fi
maintainer-script-should-not-use-fc-cache ~~ 0 ~~^(fontconfig)$ ~~ ~~${LEADIN}(?:/usr/bin/)?fc-cache(?:\s|\Z)
maintainer-script-should-not-use-gconftool ~~ 1 ~~^(gconf\d)$ ~~ ~~(?:/usr/bin/)?gconftool(?:-\d)?(?:\s|\Z)
maintainer-script-should-not-use-install-sgmlcatalog ~~ 1 ~~ ~~ ~~\binstall-sgmlcatalog\b
-maintainer-script-should-not-modify-ld-so-conf ~~ 0 ~~^libc ~~ ~~(?:\A\s*(?:cp|mv)\s+.*\s+|>\s*)/etc/ld\.so\.conf\s*(?:\s|\Z)
-maintainer-script-should-not-modify-netbase-managed-file ~~ 0 ~~ ~~ ~~(?:\A\s*(?:cp|mv)\s+.*\s+|>\s*)(/etc/(?:services|protocols|rpc))\s*(?:\s|\Z)
-update-alternatives-remove-called-in-postrm ~~ 1 ~~ ~~^postrm$ ~~\b update\-alternatives\s+\-\-remove\b
-update-alternatives-set-called-in-maintainer-script ~~ 1 ~~ ~~ ~~\b update\-alternatives\s+\-\-(?:set|set\-selections|config)\b
+maintainer-script-should-not-use-update-alternatives-remove ~~ 1 ~~ ~~^postrm$ ~~\b update\-alternatives\s+\-\-remove\b
+maintainer-script-should-not-use-update-alternatives-set ~~ 1 ~~ ~~ ~~\b update\-alternatives\s+\-\-(?:set|set\-selections|config)\b
start-stop-daemon-in-maintainer-script ~~ 0 ~~ ~~ ~~\s*start-stop-daemon(?=\s)(?!.*\s--stop\b)
suidregister-used-in-maintainer-script ~~ 1 ~~ ~~ ~~\bsuidregister\b
diff --git a/t/tests/scripts-maintainer-general/desc b/t/tests/scripts-maintainer-general/desc
index f595abb..e4c3204 100644
--- a/t/tests/scripts-maintainer-general/desc
+++ b/t/tests/scripts-maintainer-general/desc
@@ -26,6 +26,8 @@ Test-For:
maintainer-script-should-not-use-install-sgmlcatalog
maintainer-script-should-not-modify-ld-so-conf
maintainer-script-should-not-modify-netbase-managed-file
+ maintainer-script-should-not-run-update-alternatives-remove-postrm
+ maintainer-script-should-not-run-update-alternatives-set
mknod-in-maintainer-script
possibly-insecure-handling-of-tmp-files-in-maintainer-script
read-in-maintainer-script
diff --git a/t/tests/scripts-maintainer-general/tags b/t/tests/scripts-maintainer-general/tags
index ac0f503..8601f12 100644
--- a/t/tests/scripts-maintainer-general/tags
+++ b/t/tests/scripts-maintainer-general/tags
@@ -32,8 +32,9 @@ W: scripts-maintainer-general: maintainer-script-should-not-use-deprecated-chown
W: scripts-maintainer-general: maintainer-script-should-not-use-fc-cache postinst:95
W: scripts-maintainer-general: maintainer-script-should-not-use-gconftool postinst:153
W: scripts-maintainer-general: maintainer-script-should-not-use-gconftool postinst:44
+W: scripts-maintainer-general: maintainer-script-should-not-run-update-alternatives-remove-postrm postrm:7
+W: scripts-maintainer-general: maintainer-script-should-not-run-update-alternatives-set postinst:129
W: scripts-maintainer-general: possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:26
W: scripts-maintainer-general: start-stop-daemon-in-maintainer-script postinst:138
W: scripts-maintainer-general: start-stop-daemon-in-maintainer-script postinst:78
-W: scripts-maintainer-general: update-alternatives-remove-called-in-postrm postrm:7
-W: scripts-maintainer-general: update-alternatives-set-called-in-maintainer-script postinst:129
+
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git
Reply to: