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

[SCM] Debian package checker branch, master, updated. 1.24.4-110-g461090e



The following commit has been merged in the master branch:
commit 99d2581ca38472d83c9f247e32e0c78fa3282f89
Author: Frank Lichtenheld <djpig@debian.org>
Date:   Fri Sep 12 00:52:37 2008 +0200

    Fix maintainer-scripts testset for maintainer-script-ignores-errors changes
    
    While I'm at it add some more actual tests for this tag.

diff --git a/testset/maintainer-scripts/debian/postinst b/testset/maintainer-scripts/debian/postinst
index a721458..4fee500 100644
--- a/testset/maintainer-scripts/debian/postinst
+++ b/testset/maintainer-scripts/debian/postinst
@@ -1,4 +1,4 @@
-#! /bin/sh
+#! /bin/sh -e
 
 if [ "$1" = "configure" ]; then
         if [ -d /usr/doc -a ! -e /usr/doc/maintainer-scripts -a -d /usr/share/doc/maintainer-scripts ]; then
diff --git a/testset/maintainer-scripts/debian/postrm b/testset/maintainer-scripts/debian/postrm
index a337bac..c0aaf19 100644
--- a/testset/maintainer-scripts/debian/postrm
+++ b/testset/maintainer-scripts/debian/postrm
@@ -1,4 +1,5 @@
 #!/bin/bash
+#set -e
 
 update-alternatives --remove dummy /usr/bin/dummy-alternative
 
diff --git a/testset/maintainer-scripts/debian/prerm b/testset/maintainer-scripts/debian/prerm
index 2b6cd99..512169c 100644
--- a/testset/maintainer-scripts/debian/prerm
+++ b/testset/maintainer-scripts/debian/prerm
@@ -179,3 +179,5 @@ read -r foo
 read -r
 read -p "Would you like to restart the service?" foo bar
 read --fish
+
+set -e
diff --git a/testset/tags.maintainer-scripts b/testset/tags.maintainer-scripts
index 0cfc9c9..395e218 100644
--- a/testset/tags.maintainer-scripts
+++ b/testset/tags.maintainer-scripts
@@ -7,7 +7,7 @@ E: maintainer-scripts: debian-changelog-file-contains-invalid-email-address jero
 E: maintainer-scripts: forbidden-config-interpreter #!/usr/bin/python
 E: maintainer-scripts: init.d-script-not-included-in-package /etc/init.d/foo
 E: maintainer-scripts: install-sgmlcatalog-deprecated postinst:100
-E: maintainer-scripts: install-sgmlcatalog-deprecated postrm:46
+E: maintainer-scripts: install-sgmlcatalog-deprecated postrm:47
 E: maintainer-scripts: interpreter-without-predep control/config #!/usr/bin/python
 E: maintainer-scripts: maintainer-script-calls-init-script-directly prerm:55
 E: maintainer-scripts: maintainer-script-does-not-check-for-existence-of-wm-menu-config postinst:33
@@ -16,8 +16,8 @@ E: maintainer-scripts: maintainer-script-modifies-inetd-conf postinst:94
 E: maintainer-scripts: maintainer-script-modifies-netbase-managed-file postinst:85 /etc/services
 E: maintainer-scripts: maintainer-script-modifies-netbase-managed-file postinst:86 /etc/protocols
 E: maintainer-scripts: maintainer-script-modifies-netbase-managed-file postinst:87 /etc/rpc
-E: maintainer-scripts: maintainer-script-removes-device-files postrm:39
 E: maintainer-scripts: maintainer-script-removes-device-files postrm:40
+E: maintainer-scripts: maintainer-script-removes-device-files postrm:41
 E: maintainer-scripts: maintainer-script-uses-dpkg-status-directly postinst
 E: maintainer-scripts: maintainer-script-uses-dpkg-status-directly preinst
 E: maintainer-scripts: maintainer-shell-script-fails-syntax-check prerm
@@ -50,6 +50,8 @@ W: maintainer-scripts: init.d-script-not-marked-as-conffile /etc/init.d/foo
 W: maintainer-scripts: maintainer-script-calls-deprecated-wm-menu-config postinst:33
 W: maintainer-scripts: maintainer-script-empty config
 W: maintainer-scripts: maintainer-script-hides-init-failure postinst:57
+W: maintainer-scripts: maintainer-script-ignores-errors postrm
+W: maintainer-scripts: maintainer-script-ignores-errors preinst
 W: maintainer-scripts: maintainer-script-needs-depends-on-gconf2 postinst
 W: maintainer-scripts: maintainer-script-needs-depends-on-ucf postinst
 W: maintainer-scripts: maintainer-script-needs-depends-on-xml-core postinst
@@ -142,7 +144,7 @@ W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:95 'ech.os()
 W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:97 '>&bar'
 W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:98 '>& bar'
 W: maintainer-scripts: possibly-insecure-handling-of-tmp-files-in-maintainer-script postinst:52
-W: maintainer-scripts: possibly-insecure-handling-of-tmp-files-in-maintainer-script postrm:39
+W: maintainer-scripts: possibly-insecure-handling-of-tmp-files-in-maintainer-script postrm:40
 W: maintainer-scripts: postinst-does-not-load-confmodule
 W: maintainer-scripts: postinst-should-not-set-usr-doc-link
 W: maintainer-scripts: postrm-does-not-purge-debconf

-- 
Debian package checker


Reply to: