X Strike Force XFree86 SVN commit: r2120 - trunk/debian
Author: branden
Date: 2005-01-07 21:44:17 -0500 (Fri, 07 Jan 2005)
New Revision: 2120
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
trunk/debian/xserver-xfree86.config.in
Log:
Fix xserver-xfree86's configure script to not die if Discover 1.x's
discover command segfaults. Thanks to Kyle McMartin for reporting this
problem and testing the fix.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-07 03:15:09 UTC (rev 2119)
+++ trunk/debian/CHANGESETS 2005-01-08 02:44:17 UTC (rev 2120)
@@ -86,4 +86,9 @@
keys. (Closes: #266274)
2117
+Fix xserver-xfree86's configure script to not die if Discover 1.x's
+discover command segfaults. Thanks to Kyle McMartin for reporting this
+problem and testing the fix.
+ 2120
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-07 03:15:09 UTC (rev 2119)
+++ trunk/debian/changelog 2005-01-08 02:44:17 UTC (rev 2120)
@@ -67,8 +67,12 @@
* Add patch by Timothy Baldwin to evdev support to fix broken backslash
keys. (Closes: #266274)
- -- Branden Robinson <branden@debian.org> Thu, 6 Jan 2005 20:39:52 -0500
+ * Fix xserver-xfree86's configure script to not die if Discover 1.x's
+ discover command segfaults. Thanks to Kyle McMartin for reporting this
+ problem and testing the fix.
+ -- Branden Robinson <branden@debian.org> Fri, 7 Jan 2005 21:43:13 -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/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2005-01-07 03:15:09 UTC (rev 2119)
+++ trunk/debian/xserver-xfree86.config.in 2005-01-08 02:44:17 UTC (rev 2120)
@@ -70,8 +70,10 @@
rm -f $VENDOR_MODEL_FILE $SERVER_FILE $DRIVER_FILE
else
# must be Discover 1.x
- DISCOVERED_VIDEO=$(discover --disable=serial,parallel \
- --format="%V %M\t%S\t%D\n" video 2>/dev/null)
+ CMD="discover --disable=serial,parallel \
+ --format=\"%V %M\t%S\t%D\n\" video"
+ DISCOVERED_VIDEO=$(eval $CMD 2>/dev/null) || debug_report_status "$CMD" \
+ "$?"
fi
echo "$DISCOVERED_VIDEO"
else
Reply to: