r20490 - in /desktop/unstable/sabayon/debian: changelog patches/02_environ_crash.patch

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Jun 27 16:45:48 2009
New Revision: 20490

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=20490
Log:
02_environ_crash.patch: new patch. Fix a crash when there is no 
XAUTHLOCALHOSTNAME set.

Added:
    desktop/unstable/sabayon/debian/patches/02_environ_crash.patch
Modified:
    desktop/unstable/sabayon/debian/changelog

Modified: desktop/unstable/sabayon/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/changelog?rev=20490&op=diff
==============================================================================
--- desktop/unstable/sabayon/debian/changelog (original)
+++ desktop/unstable/sabayon/debian/changelog Sat Jun 27 16:45:48 2009
@@ -35,6 +35,8 @@
   * Only require python-gconf, not python-gnome2.
   * Remove useless XB-Python-Version.
   * Force XNEST_PATH to Xephyr. Use xserver-xephyr instead of xnest.
+  * 02_environ_crash.patch: new patch. Fix a crash when there is no 
+    XAUTHLOCALHOSTNAME set.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 27 Jun 2009 18:30:30 +0200
 

Added: desktop/unstable/sabayon/debian/patches/02_environ_crash.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/sabayon/debian/patches/02_environ_crash.patch?rev=20490&op=file
==============================================================================
--- desktop/unstable/sabayon/debian/patches/02_environ_crash.patch (added)
+++ desktop/unstable/sabayon/debian/patches/02_environ_crash.patch Sat Jun 27 16:45:48 2009
@@ -1,0 +1,12 @@
+--- admin-tool/profilesdialog.py.orig	2009-02-12 01:24:27.000000000 +0100
++++ admin-tool/profilesdialog.py	2009-06-27 18:44:25.799899372 +0200
+@@ -184,7 +184,8 @@
+ 
+         if self.temp_xauth_path:
+             new_environ.append ("XAUTHORITY=%s" % self.temp_xauth_path)
+-            new_environ.append ("XAUTHLOCALHOSTNAME=%s" % os.environ["XAUTHLOCALHOSTNAME"])
++            if "XAUTHLOCALHOSTNAME" in os.environ:
++                new_environ.append ("XAUTHLOCALHOSTNAME=%s" % os.environ["XAUTHLOCALHOSTNAME"])
+ 
+         return new_environ
+