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

X Strike Force XFree86 SVN commit: r1188 - trunk/debian



Author: branden
Date: 2004-03-25 18:06:35 -0500 (Thu, 25 Mar 2004)
New Revision: 1188

Modified:
   trunk/debian/changelog
   trunk/debian/xserver-xfree86.config.in
Log:
Discard standard error output from Discover 1.x.


Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog	2004-03-25 23:04:49 UTC (rev 1187)
+++ trunk/debian/changelog	2004-03-25 23:06:35 UTC (rev 1188)
@@ -51,14 +51,14 @@
   * If using Discover 1.x to scan for hardware in the XFree86 X server
     packages' config scripts, pass the discover command the
     "--disable=serial,parallel" option to avoid long delays on some systems.
-    We're certain to not find a VGA device on those buses anyway.
-    (Closes: #237046)
+    We're certain to not find a VGA device on those buses anyway.  Also,
+    discard standard error output from discover 1.x.  (Closes: #237046)
 
   * 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 <branden@debian.org>  Thu, 25 Mar 2004 18:03:42 -0500
+ -- Branden Robinson <branden@debian.org>  Thu, 25 Mar 2004 18:05:50 -0500
 
 xfree86 (4.3.0-7) unstable; urgency=medium
 

Modified: trunk/debian/xserver-xfree86.config.in
===================================================================
--- trunk/debian/xserver-xfree86.config.in	2004-03-25 23:04:49 UTC (rev 1187)
+++ trunk/debian/xserver-xfree86.config.in	2004-03-25 23:06:35 UTC (rev 1188)
@@ -69,7 +69,7 @@
   else
     # must be Discover 1.x
     DISCOVERED_VIDEO=$(discover --disable=serial,parallel \
-                                --format="%V %M\t%S\t%D\n" video)
+                                --format="%V %M\t%S\t%D\n" video 2>/dev/null)
   fi
   echo "$DISCOVERED_VIDEO"
 }



Reply to: