The following commit has been merged in the master branch:
commit d0a4b103d66e50074a9057b23390ea2a2ddcd748
Author: James Vega <[email protected]>
Date: Mon Jul 26 18:18:07 2010 -0400
checkbashisms: Allow kill/trap XSI-isms unless --posix is given.
Closes: #486823
Signed-off-by: James Vega <[email protected]>
diff --git a/debian/changelog b/debian/changelog
index 610b331..efd82dc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ devscripts (2.10.66) UNRELEASED; urgency=low
* bts: Fix ability to clear all tags on a bug. (Closes: #539688)
* rc-alert: Add missing hyphens and correct formatting in the man page.
Based on a patch by Salvatore Bonaccorso. (Closes: #589607)
+ * checkbashisms: Allow kill & trap XSI-isms unless --posix is given, as per
+ Policy 3.9.1.0. (Closes: #486823)
[ Cyril Brulebois ]
* uscan: Get rid of extra quoting in dpkg --compare-versions calls.
diff --git a/scripts/checkbashisms.pl b/scripts/checkbashisms.pl
index 920106a..8ae9dc3 100755
--- a/scripts/checkbashisms.pl
+++ b/scripts/checkbashisms.pl
@@ -517,8 +517,6 @@ sub init_hashes {
qr'\&>' => q<should be \>word 2\>&1>,
qr'(<\&|>\&)\s*((-|\d+)[^\s;|)}`&\\\\]|[^-\d\s]+(?<!\$)(?!\d))' =>
q<should be \>word 2\>&1>,
- $LEADIN . qr'kill\s+-[^sl]\w*' => q<kill -[0-9] or -[A-Z]>,
- $LEADIN . qr'trap\s+["\']?.*["\']?\s+.*[1-9]' => q<trap with signal
numbers>,
qr'\[\[(?!:)' => q<alternative test command ([[ foo ]] should be [ foo
])>,
qr'/dev/(tcp|udp)' => q</dev/(tcp|udp)>,
$LEADIN . qr'builtin\s' => q<builtin>,
@@ -601,6 +599,8 @@ sub init_hashes {
$bashisms{$LEADIN . qr'local\s+\w+='} = q<local foo=bar>;
$bashisms{$LEADIN . qr'local\s+\w+\s+\w+'} = q<local x y>;
$bashisms{$LEADIN . qr'((?:test|\[)\s+.+\s-[ao])\s'} = q<test -a/-o>;
+ $bashisms{$LEADIN . qr'kill\s+-[^sl]\w*'} => q<kill -[0-9] or -[A-Z]>;
+ $bashisms{$LEADIN . qr'trap\s+["\']?.*["\']?\s+.*[1-9]'} => q<trap with
signal numbers>;
}
if ($makefile) {
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
