X Strike Force XFree86 SVN commit: r1427 - in trunk/debian: . local/Xsession.d
Author: branden
Date: 2004-05-21 01:34:57 -0500 (Fri, 21 May 2004)
New Revision: 1427
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/local/Xsession.d/20xfree86-common_process-args
Log:
Handle failure of "which" command when processing arguments to Xsession,
so that the script is not aborted prematurely (thanks, Oliver Bausinger).
(Closes: #248632)
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2004-05-21 06:00:15 UTC (rev 1426)
+++ trunk/debian/CHANGESETS 2004-05-21 06:34:57 UTC (rev 1427)
@@ -120,4 +120,8 @@
spurious.
1426
+Handle failure of "which" command when processing arguments to Xsession, so that
+the script is not aborted prematurely (thanks, Oliver Bausinger).
+ 1427
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-05-21 06:00:15 UTC (rev 1426)
+++ trunk/debian/changelog 2004-05-21 06:34:57 UTC (rev 1427)
@@ -185,12 +185,16 @@
overlaps in these cases (though there are with libxrandr-dev), so such
declarations are spurious. (Closes: #248539)
+ * Handle failure of "which" command when processing arguments to Xsession,
+ so that the script is not aborted prematurely (thanks, Oliver Bausinger).
+ (Closes: #248632)
+
Changes by Fabio Massimo Di Nitto:
* Update xutils's package description to refer to bdftruncate and ucs2any
programs by their correct names.
- -- Branden Robinson <branden@debian.org> Fri, 21 May 2004 00:56:45 -0500
+ -- Branden Robinson <branden@debian.org> Fri, 21 May 2004 01:30:09 -0500
xfree86 (4.3.0.dfsg.1-1) unstable; urgency=low
Modified: trunk/debian/local/Xsession.d/20xfree86-common_process-args
===================================================================
--- trunk/debian/local/Xsession.d/20xfree86-common_process-args 2004-05-21 06:00:15 UTC (rev 1426)
+++ trunk/debian/local/Xsession.d/20xfree86-common_process-args 2004-05-21 06:34:57 UTC (rev 1427)
@@ -33,7 +33,7 @@
;;
*)
# Specific program was requested.
- STARTUP_FULL_PATH=$(which $1)
+ STARTUP_FULL_PATH=$(which $1 || true)
if [ -n "$STARTUP_FULL_PATH" ] && [ -e "$STARTUP_FULL_PATH" ]; then
if [ -x "$STARTUP_FULL_PATH" ]; then
STARTUP="$1"
Reply to: