r24697 - in /desktop/unstable/gdm/debian: changelog patches/23_xsession-errors.patch patches/series

joss at users.alioth.debian.org joss at users.alioth.debian.org
Sun Jul 4 13:21:34 UTC 2010


Author: joss
Date: Sun Jul  4 13:21:26 2010
New Revision: 24697

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=24697
Log:
23_xsession-errors.patch: disable the obnoxious behavior that stops 
filling .xsession-errors when there is too much output.

Added:
    desktop/unstable/gdm/debian/patches/23_xsession-errors.patch
Modified:
    desktop/unstable/gdm/debian/changelog
    desktop/unstable/gdm/debian/patches/series

Modified: desktop/unstable/gdm/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/changelog?rev=24697&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/changelog [utf-8] (original)
+++ desktop/unstable/gdm/debian/changelog [utf-8] Sun Jul  4 13:21:26 2010
@@ -2,6 +2,8 @@
 
   * Use linux-any wildcard instead of listing non-linux architectures.
   * Bump standards version accordingly.
+  * 23_xsession-errors.patch: disable the obnoxious behavior that stops 
+    filling .xsession-errors when there is too much output.
 
  -- Josselin Mouette <joss at debian.org>  Sun, 04 Jul 2010 13:50:28 +0200
 

Added: desktop/unstable/gdm/debian/patches/23_xsession-errors.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/23_xsession-errors.patch?rev=24697&op=file
==============================================================================
--- desktop/unstable/gdm/debian/patches/23_xsession-errors.patch (added)
+++ desktop/unstable/gdm/debian/patches/23_xsession-errors.patch [utf-8] Sun Jul  4 13:21:26 2010
@@ -1,0 +1,29 @@
+Index: gdm-2.20.11/daemon/slave.c
+===================================================================
+--- gdm-2.20.11.orig/daemon/slave.c	2010-07-04 15:16:55.919565088 +0200
++++ gdm-2.20.11/daemon/slave.c	2010-07-04 15:17:11.559565073 +0200
+@@ -373,10 +373,6 @@ run_session_output (gboolean read_until_
+ 			break;
+ 		}
+ 
+-		if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES ||
+-			       got_xfsz_signal)
+-			continue;
+-
+ 		/* write until we succeed in writing something */
+ 		VE_IGNORE_EINTR (written = write (d->xsession_errors_fd, buf, r));
+ 		if G_UNLIKELY (written < 0 || got_xfsz_signal) {
+@@ -397,13 +393,6 @@ run_session_output (gboolean read_until_
+ 
+ 		d->xsession_errors_bytes += r;
+ 
+-		if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES &&
+-			       ! got_xfsz_signal) {
+-			VE_IGNORE_EINTR (write (d->xsession_errors_fd,
+-						"\n...Too much output, ignoring rest...\n",
+-						strlen ("\n...Too much output, ignoring rest...\n")));
+-		}
+-
+ 		/* there wasn't more then buf available, so no need to try reading
+ 		 * again, unless we really want to */
+ 		if (r < sizeof (buf) && ! read_until_eof)

Modified: desktop/unstable/gdm/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gdm/debian/patches/series?rev=24697&op=diff
==============================================================================
--- desktop/unstable/gdm/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gdm/debian/patches/series [utf-8] Sun Jul  4 13:21:26 2010
@@ -3,6 +3,7 @@
 20_xdm-stuff.patch
 21_XKeepsCrashing_bashism.patch
 22_Xreset.patch
+23_xsession-errors.patch
 35_gdm.conf.patch
 37_manpage-binaries.patch
 41_config-files.patch




More information about the pkg-gnome-commits mailing list