From c4406d4acee44865ed23c765e5f0e659d97263e7 Mon Sep 17 00:00:00 2001 From: "Owen W. Taylor" Date: Sat, 24 Apr 2010 09:41:03 -0400 Subject: [PATCH] Make getting the environment from gnome-session more robust readlink() on /proc//exe can have results like: /usr/bin/gnome-keyring-daemon.#prelink#.5DFZsF (deleted) /usr/bin/gnome-session (deleted) To find gnome-session in a more robust way, read /proc//cmdline instead. https://bugzilla.gnome.org/show_bug.cgi?id=616706 --- src/gnome-shell.in | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/gnome-shell.in b/src/gnome-shell.in index 27f7b0df0..0cb6db71c 100644 --- a/src/gnome-shell.in +++ b/src/gnome-shell.in @@ -37,10 +37,15 @@ def get_running_session_environs(): if not stat.st_uid == myuid: continue try: - exe = os.readlink(piddir + '/exe') - except OSError, e: + f = open(piddir + "/cmdline") + command = f.read() + f.close() + except IOError, e: continue - if os.path.basename(exe) != 'gnome-session': + # /proc/cmdline is separated and terminated by NULs + command = command.split("\x00")[0] + command = os.path.basename(command) + if command != 'gnome-session': continue try: f = open(os.path.join(piddir, 'environ'))