X Strike Force XFree86 SVN commit: r2166 - in trunk/debian: . local scripts
Author: branden
Date: 2005-01-27 02:54:19 -0500 (Thu, 27 Jan 2005)
New Revision: 2166
Modified:
trunk/debian/CHANGESETS
trunk/debian/TODO
trunk/debian/changelog
trunk/debian/local/xvfb-run
trunk/debian/scripts/manifest-install-reconcile
trunk/debian/xserver-common.config.in
trunk/debian/xserver-xfree86.config.in
Log:
Stop using the "local" keyword in /bin/sh scripts -- it turns out "local"
is not POSIX, but posh -n won't tell you that as it doesn't do a syntax
parse on function bodies, which is the only place that keyword makes
sense. Comment out this usage instead of removing it as a means of
stoking my likely-futile hopes that the Debian Policy Manual will carve
out another exception to POSIX compliance for /bin/sh scripts in this
area. A language with only global scope for variables scarcely bears
thinking about. Thanks to Clint Adams for pointing out this unfiled RC
bug, and to Steve Langasek for hounding me incessantly about it.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-27 07:31:50 UTC (rev 2165)
+++ trunk/debian/CHANGESETS 2005-01-27 07:54:19 UTC (rev 2166)
@@ -234,4 +234,15 @@
X server packages.
2165
+Stop using the "local" keyword in /bin/sh scripts -- it turns out "local"
+is not POSIX, but posh -n won't tell you that as it doesn't do a syntax
+parse on function bodies, which is the only place that keyword makes
+sense. Comment out this usage instead of removing it as a means of
+stoking my likely-futile hopes that the Debian Policy Manual will carve
+out another exception to POSIX compliance for /bin/sh scripts in this
+area. A language with only global scope for variables scarcely bears
+thinking about. Thanks to Clint Adams for pointing out this unfiled RC
+bug, and to Steve Langasek for hounding me incessantly about it.
+ 2166
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/TODO
===================================================================
--- trunk/debian/TODO 2005-01-27 07:31:50 UTC (rev 2165)
+++ trunk/debian/TODO 2005-01-27 07:54:19 UTC (rev 2166)
@@ -17,9 +17,6 @@
4.3.0.dfsg.1-11
---------------
-* Stop using the "local" keyword in shell scripts. Clint Adams points out that
- it's not secretly allowed by posh, which means my scripts aren't policy
- compliant. Bastard. :-P
* Migrate the bug scripts to the more sophisticated world order now in use.
+ Move current scripts from /usr/share/bug/$PACKAGE to
/usr/share/bug/$PACKAGE/script (renaming in SVN from $PACKAGE.bug to
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-27 07:31:50 UTC (rev 2165)
+++ trunk/debian/changelog 2005-01-27 07:54:19 UTC (rev 2166)
@@ -177,8 +177,18 @@
* Update FAQ entry "What is the story with XFree86 3.x?" to mention the Xsun
X server packages.
- -- Branden Robinson <branden@debian.org> Wed, 26 Jan 2005 11:58:49 -0500
+ * Stop using the "local" keyword in /bin/sh scripts -- it turns out "local"
+ is not POSIX, but posh -n won't tell you that as it doesn't do a syntax
+ parse on function bodies, which is the only place that keyword makes
+ sense. Comment out this usage instead of removing it as a means of
+ stoking my likely-futile hopes that the Debian Policy Manual will carve
+ out another exception to POSIX compliance for /bin/sh scripts in this
+ area. A language with only global scope for variables scarcely bears
+ thinking about. Thanks to Clint Adams for pointing out this unfiled RC
+ bug, and to Steve Langasek for hounding me incessantly about it.
+ -- Branden Robinson <branden@debian.org> Thu, 27 Jan 2005 02:48:16 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Modified: trunk/debian/local/xvfb-run
===================================================================
--- trunk/debian/local/xvfb-run 2005-01-27 07:31:50 UTC (rev 2165)
+++ trunk/debian/local/xvfb-run 2005-01-27 07:54:19 UTC (rev 2166)
@@ -69,7 +69,10 @@
# Find a free server number by looking at .X*-lock files in /tmp.
find_free_servernum() {
- local i
+ # Sadly, the "local" keyword is not POSIX. Leave the next line commented in
+ # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
+ # anyway.
+ #local i
i=$SERVERNUM
while [ -f /tmp/.X$i-lock ]; do
Modified: trunk/debian/scripts/manifest-install-reconcile
===================================================================
--- trunk/debian/scripts/manifest-install-reconcile 2005-01-27 07:31:50 UTC (rev 2165)
+++ trunk/debian/scripts/manifest-install-reconcile 2005-01-27 07:54:19 UTC (rev 2166)
@@ -52,7 +52,10 @@
dump_dh_file () {
# Syntax: dump_dh_file PACKAGE FILETYPE ARCH
- local arch filetype match package
+ # Sadly, the "local" keyword is not POSIX. Leave the next line commented in
+ # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
+ # anyway.
+ #local arch filetype match package
package="$1"
filetype="$2"
Modified: trunk/debian/xserver-common.config.in
===================================================================
--- trunk/debian/xserver-common.config.in 2005-01-27 07:31:50 UTC (rev 2165)
+++ trunk/debian/xserver-common.config.in 2005-01-27 07:54:19 UTC (rev 2166)
@@ -61,7 +61,10 @@
}
validate_nice_value () {
- local retval
+ # Sadly, the "local" keyword is not POSIX. Leave the next line commented in
+ # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
+ # anyway.
+ #local retval
retval=1
# first, try to subtract number from itself to validate numeric input
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2005-01-27 07:31:50 UTC (rev 2165)
+++ trunk/debian/xserver-xfree86.config.in 2005-01-27 07:54:19 UTC (rev 2166)
@@ -353,7 +353,10 @@
# Better just to go the simple and stupid route. Yes, I know this is not
# very efficient.
- local priority_ceiling requested_priority
+ # Sadly, the "local" keyword is not POSIX. Leave the next line commented in
+ # the hope Debian Policy eventually changes to allow it in /bin/sh scripts
+ # anyway.
+ #local priority_ceiling requested_priority
# Validate arguments.
if [ $# -ne 1 ]; then
Reply to: