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

X Strike Force XFree86 SVN commit: r1119 - in trunk/debian: . local



Author: branden
Date: 2004-03-01 10:40:14 -0500 (Mon, 01 Mar 2004)
New Revision: 1119

Modified:
   trunk/debian/changelog
   trunk/debian/local/Xsession
Log:
Stop attempting to chmod X session error file if it is a symbolic link (see
#234788).


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-03-01 15:35:59 UTC (rev 1118)
+++ trunk/debian/changelog	2004-03-01 15:40:14 UTC (rev 1119)
@@ -3,8 +3,12 @@
   * Fix missing non-breaking spaces (thanks, Christian Perrier).
     - debian/po/fr.po
 
- -- Branden Robinson <branden@debian.org>  Mon,  1 Mar 2004 10:34:14 -0500
+  * Stop attempting to chmod X session error file if it is a symbolic link
+    (see #234788).
+    - debian/local/Xsession
 
+ -- Branden Robinson <branden@debian.org>  Mon,  1 Mar 2004 10:38:59 -0500
+
 xfree86 (4.3.0-3) unstable; urgency=medium
 
   * Urgency due to fix for serious bug which frustrates removal of library

Modified: trunk/debian/local/Xsession
===================================================================
--- trunk/debian/local/Xsession	2004-03-01 15:35:59 UTC (rev 1118)
+++ trunk/debian/local/Xsession	2004-03-01 15:40:14 UTC (rev 1119)
@@ -78,7 +78,8 @@
 ERRFILE=$HOME/.xsession-errors
 
 # attempt to create an error file; abort if we cannot
-if touch $ERRFILE 2> /dev/null && [ -w $ERRFILE ]; then
+if touch "$ERRFILE" 2> /dev/null && [ -w "$ERRFILE" ] &&
+  [ ! -L "$ERRFILE" ]; then
   chmod 600 "$ERRFILE"
 elif ERRFILE=$(tempfile 2> /dev/null); then
   if ! ln -sf "$ERRFILE" "${TMPDIR:=/tmp}/xsession-$USER"; then



Reply to: