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

[SCM] Debian package checker branch, master, updated. 2.4.2-47-g7cf10de



The following commit has been merged in the master branch:
commit 68242a8a19f60c655b42e22adaa0e47dc07ecbeb
Author: Russ Allbery <rra@debian.org>
Date:   Sun Jul 25 20:19:06 2010 -0700

    Drop bashism check for kill -signal and trap with numbers
    
    * checks/scripts{,.desc}:
      + [RA] Allow kill -<signal> and kill and trap with signal numbers in
        /bin/sh scrips, now allowed by Policy 3.9.1.
    
    We could do better and check for only the numbers allowed by Policy,
    but this will do for now.

diff --git a/checks/scripts b/checks/scripts
index a14d3c9..0ea4eee 100644
--- a/checks/scripts
+++ b/checks/scripts
@@ -247,9 +247,6 @@ our @bashism_regexs = (
 	# read with option other than -r
     $LEADIN . qr'read\s*(?:-\w+\s*)*(?:\".*?\"|[\'].*?[\'])?\s*(?:;|$)',
 	# read without variable
-    $LEADIN . qr'kill\s+-[^sl]\w*',# kill -[0-9] or -[A-Z]
-    $LEADIN . qr'trap\s+(?:\'(?:[^\'\\]|\\.)*\'\s+|\"(?:[^\"\\]|\\.)*\"\s+)?[^\"\']*[1-9]',
-	# trap with signal numbers
     qr'\&>',		         # cshism
     qr'(<\&|>\&)\s*((-|\d+)[^\s;|)`&\\\\]|[^-\d\s]+)', # should be >word 2>&1
     qr'\[\[(?!:)',		 # alternative test command
diff --git a/debian/changelog b/debian/changelog
index 232da36..3627890 100755
--- a/debian/changelog
+++ b/debian/changelog
@@ -58,6 +58,8 @@ lintian (2.4.3) UNRELEASED; urgency=low
       various Python debhelper scripts.  (Closes: #575590, #582763)
     + [RA] Add runhaskell and runghc.  (Closes: #589266)
     + [RA] Add references to Policy requirements added in 3.9.1.
+    + [RA] Allow kill -<signal> and kill and trap with signal numbers in
+      /bin/sh scrips, now allowed by Policy 3.9.1.
 
   * debian/changelog:
     + [RA] Fix Policy 3.9.0 reference in 2.4.2.  (Closes: #587549)
diff --git a/t/tests/scripts-bashisms/tags b/t/tests/scripts-bashisms/tags
index d330f0b..07904e0 100644
--- a/t/tests/scripts-bashisms/tags
+++ b/t/tests/scripts-bashisms/tags
@@ -66,9 +66,7 @@ W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:170 'source ~/b
 W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:171 'source a'
 W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:19 '&>'
 W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:22 'source $FOO'
-W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:24 'trap "echo hi" EXIT HUP 3'
 W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:26 '[['
-W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:27 '    kill -HUP'
 W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:43 '${line:3:1}'
 W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:47 'read -x'
 W: scripts-bashisms: possible-bashism-in-maintainer-script prerm:48 'read -x'

-- 
Debian package checker


Reply to: