Author: djpig
Date: 2005-09-28 20:23:51 +0200 (Wed, 28 Sep 2005)
New Revision: 502
Modified:
trunk/checks/scripts
trunk/debian/changelog
trunk/testset/maintainer-scripts/debian/prerm
trunk/testset/tags.maintainer-scripts
Log:
Only match 'local' at the beginning of a line. The check is too
ambigious otherwise. Reported by Marc Haber (Closes: #330548)
Modified: trunk/checks/scripts
===================================================================
--- trunk/checks/scripts 2005-09-24 23:00:18 UTC (rev 501)
+++ trunk/checks/scripts 2005-09-28 18:23:51 UTC (rev 502)
@@ -460,7 +460,7 @@
'((?:test|\[)\s+.+\s-[ao])\s',# test/[ -a/-o binary operators
'(?:^|\s+)kill\s+-[^sl]\w*', # kill -[0-9] or -[A-Z]
'(?:^|\s+)trap\s+["\']?.*["\']?\s+.*[1-9]', # trap with
signal numbers
- '(?:^|\s+)local\s', # local scoping of variables
+ '(?:^\s*)local\s', # local scoping of variables
'\&>', # cshism
'\[\[(?!:)', # alternative test command
);
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-09-24 23:00:18 UTC (rev 501)
+++ trunk/debian/changelog 2005-09-28 18:23:51 UTC (rev 502)
@@ -22,6 +22,8 @@
* checks/scripts:
+ [FL] PythonX.Y dependency can also be satisfied with pythonX.Y-minimal.
Noted by Matthias Klose (Closes: #326643)
+ + [FL] Only match 'local' at the beginning of a line. The check is too
+ ambigious otherwise. Reported by Marc Haber (Closes: #330548)
* checks/shared-libs:
+ [HE] Apply patch from Bastian Blank to check for executable stacks in
binaries. New checks are called shlib-without-PT_GNU_STACK-section,
Modified: trunk/testset/maintainer-scripts/debian/prerm
===================================================================
--- trunk/testset/maintainer-scripts/debian/prerm 2005-09-24 23:00:18 UTC
(rev 501)
+++ trunk/testset/maintainer-scripts/debian/prerm 2005-09-28 18:23:51 UTC
(rev 502)
@@ -21,6 +21,7 @@
fi
function foo( ) {
+ # but not here: local
local bar
echo "foo" &>/dev/null
}
Modified: trunk/testset/tags.maintainer-scripts
===================================================================
--- trunk/testset/tags.maintainer-scripts 2005-09-24 23:00:18 UTC (rev
501)
+++ trunk/testset/tags.maintainer-scripts 2005-09-28 18:23:51 UTC (rev
502)
@@ -25,12 +25,12 @@
W: maintainer-scripts: possible-bashism-in-maintainer-script postinst:4 '[ -d
/usr/doc -a ! -e /usr/doc/maintainer-scripts -a '
W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:19 '[ "$2"
== '
W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:23
'function foo( )'
-W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:24 '
local '
-W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:25 '&>'
-W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:28 'source
$FOO'
-W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:30 'trap
"echo hi" EXIT HUP 3'
-W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:32 '[['
-W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:33 '
kill -HUP'
+W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:25 '
local '
+W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:26 '&>'
+W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:29 'source
$FOO'
+W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:31 'trap
"echo hi" EXIT HUP 3'
+W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:33 '[['
+W: maintainer-scripts: possible-bashism-in-maintainer-script prerm:34 '
kill -HUP'
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
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
