X Strike Force XFree86 SVN commit: r2128 - in trunk/debian: . patches
Author: branden
Date: 2005-01-11 01:18:28 -0500 (Tue, 11 Jan 2005)
New Revision: 2128
Added:
trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff
Modified:
trunk/debian/CHANGESETS
trunk/debian/changelog
Log:
Fix xprop to not bleat a usage message when XOpenDisplay() fails. Being
unable to connect to the X server is an operational error, not a
user-input error.
Modified: trunk/debian/CHANGESETS
===================================================================
--- trunk/debian/CHANGESETS 2005-01-10 20:33:51 UTC (rev 2127)
+++ trunk/debian/CHANGESETS 2005-01-11 06:18:28 UTC (rev 2128)
@@ -127,4 +127,9 @@
document the reason.
2125
+Fix xprop to not bleat a usage message when XOpenDisplay() fails. Being
+unable to connect to the X server is an operational error, not a
+user-input error.
+ 2128
+
vim:set ai et sts=4 sw=4 tw=80:
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2005-01-10 20:33:51 UTC (rev 2127)
+++ trunk/debian/changelog 2005-01-11 06:18:28 UTC (rev 2128)
@@ -101,8 +101,12 @@
rejected. If TDFXValidMode() would return MODE_BAD, use xf86DrvMsg() to
document the reason.
- -- Branden Robinson <branden@debian.org> Mon, 10 Jan 2005 15:19:57 -0500
+ * Fix xprop to not bleat a usage message when XOpenDisplay() fails. Being
+ unable to connect to the X server is an operational error, not a
+ user-input error.
+ -- Branden Robinson <branden@debian.org> Tue, 11 Jan 2005 01:17:16 -0500
+
xfree86 (4.3.0.dfsg.1-10) unstable; urgency=medium
* Upload urgency set to medium due to fix for stable-release-critical bugs
Added: trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff
===================================================================
--- trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff 2005-01-10 20:33:51 UTC (rev 2127)
+++ trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff 2005-01-11 06:18:28 UTC (rev 2128)
@@ -0,0 +1,24 @@
+$Id$
+
+This patch by Branden Robinson.
+
+General philosophy:
+
+The user should only be shown a usage messages when:
+ * it is asked for with a --help option or the like.
+ * the command line is syntactically invalid.
+
+Not submitted upstream to XFree86 or X.Org.
+
+--- xc/programs/xprop/dsimple.c~ 2005-01-09 02:40:41.000000000 -0500
++++ xc/programs/xprop/dsimple.c 2005-01-09 02:41:58.000000000 -0500
+@@ -144,8 +144,7 @@
+ if (d == NULL) {
+ fprintf (stderr, "%s: unable to open display '%s'\n",
+ program_name, XDisplayName (display_name));
+- usage ();
+- /* doesn't return */
++ exit (1);
+ }
+
+ return(d);
Property changes on: trunk/debian/patches/099r_xprop_do_not_spew_usage_on_connection_error.diff
___________________________________________________________________
Name: svn:keywords
+ Id
Reply to: