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

X Strike Force XFree86 SVN commit: r2172 - in trunk/debian: . scripts



Author: branden
Date: 2005-02-08 02:37:51 -0500 (Tue, 08 Feb 2005)
New Revision: 2172

Modified:
   trunk/debian/CHANGESETS
   trunk/debian/changelog
   trunk/debian/scripts/validate-posix-sh
Log:
Fix validate-posix-sh script to stop pretending that ash and dash are
different shells -- in Debian, they're not.


Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS	2005-02-08 07:13:50 UTC (rev 2171)
+++ trunk/debian/CHANGESETS	2005-02-08 07:37:51 UTC (rev 2172)
@@ -258,4 +258,8 @@
 and then nothing done about the answer.
     2169
 
+Fix validate-posix-sh script to stop pretending that ash and dash are
+different shells -- in Debian, they're not.
+    2172
+
 vim:set ai et sts=4 sw=4 tw=80:

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2005-02-08 07:13:50 UTC (rev 2171)
+++ trunk/debian/changelog	2005-02-08 07:37:51 UTC (rev 2172)
@@ -198,8 +198,11 @@
     the user is not confusingly shown a "do autodection?" debconf question,
     and then nothing done about the answer.
 
- -- Branden Robinson <branden@debian.org>  Tue,  8 Feb 2005 01:41:54 -0500
+  * Fix validate-posix-sh script to stop pretending that ash and dash are
+    different shells -- in Debian, they're not.
 
+ -- Branden Robinson <branden@debian.org>  Tue,  8 Feb 2005 02:34:03 -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/scripts/validate-posix-sh
===================================================================
--- trunk/debian/scripts/validate-posix-sh	2005-02-08 07:13:50 UTC (rev 2171)
+++ trunk/debian/scripts/validate-posix-sh	2005-02-08 07:37:51 UTC (rev 2172)
@@ -40,7 +40,10 @@
         usage >&2
         exit 2
     fi
-    for SH in "$ASH" "$BASH" "$DASH" "$KSH" "$POSH"; do
+    # $ASH is omitted because in Debian -- regrettably -- it is just a symbolic
+    # link to dash.  The real ash is not packaged.  (For that matter, "dash"
+    # isn't really the "Debian Almquist" shell, but the "Xu shell".)
+    for SH in "$BASH" "$DASH" "$KSH" "$POSH"; do
         CMD=${SH%% *}
         if which "$CMD" >/dev/null 2>&1; then
             if ! $SH "$1"; then



Reply to: