Author: branden
Date: 2004-03-25 18:04:49 -0500 (Thu, 25 Mar 2004)
New Revision: 1187
Modified:
trunk/debian/changelog
trunk/debian/xserver-xfree86.config.in
Log:
If using Discover 2.x to scan for hardware in the XFree86 X server
packages' config scripts, invoke the discover command such that an
abnormal exit on its part does not crash the script.
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2004-03-25 22:56:46 UTC (rev 1186)
+++ trunk/debian/changelog 2004-03-25 23:04:49 UTC (rev 1187)
@@ -54,8 +54,12 @@
We're certain to not find a VGA device on those buses anyway.
(Closes: #237046)
- -- Branden Robinson <[EMAIL PROTECTED]> Thu, 25 Mar 2004 17:54:37 -0500
+ * If using Discover 2.x to scan for hardware in the XFree86 X server
+ packages' config scripts, invoke the discover command such that an
+ abnormal exit on its part does not crash the script.
+ -- Branden Robinson <[EMAIL PROTECTED]> Thu, 25 Mar 2004 18:03:42 -0500
+
xfree86 (4.3.0-7) unstable; urgency=medium
* Urgency due to fix for FTBFS. Yes -- I too am begging for it to stop.
Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in 2004-03-25 22:56:46 UTC (rev
1186)
+++ trunk/debian/xserver-xfree86.config.in 2004-03-25 23:04:49 UTC (rev
1187)
@@ -54,9 +54,16 @@
VENDOR_MODEL_FILE=$(tempfile)
SERVER_FILE=$(tempfile)
DRIVER_FILE=$(tempfile)
- discover --type-summary display > $VENDOR_MODEL_FILE
- discover --data-path=xfree86/server/name
--data-version=${SOURCE_VERSION%-*} display > $SERVER_FILE
- discover --data-path=xfree86/server/device/driver
--data-version=${SOURCE_VERSION%-*} display > $DRIVER_FILE
+
+ CMD="discover --type-summary display"
+ eval $CMD > $VENDOR_MODEL_FILE || debug_report_status "$CMD" "$?"
+ CMD="discover --data-path=xfree86/server/name \
+ --data-version=${SOURCE_VERSION%-*} display"
+ eval $CMD > $SERVER_FILE || debug_report_status "$CMD" "$?"
+ CMD="discover --data-path=xfree86/server/device/driver \
+ --data-version=${SOURCE_VERSION%-*} display"
+ eval $CMD > $DRIVER_FILE || debug_report_status "$CMD" "$?"
+
DISCOVERED_VIDEO=$(paste $VENDOR_MODEL_FILE $SERVER_FILE $DRIVER_FILE)
rm -f $VENDOR_MODEL_FILE $SERVER_FILE $DRIVER_FILE
else
