Package: xdg-utils Version: 1.1.0~rc1-2 Severity: normal Tags: patch Hello,
The latest version of gnome-screensaver-command does not seem to exit 1 when gnome-screensaver is not running. As a consequence, xdg-screensaver:966 always considers gnome-screensaver is being used. Here is a patch to correct that: it adds a grep to look for “not running” in gnome-screensaver-command's stderr instead of relying on the exit code. I also modified the xscreensaver detection line just above to use the quiet option of grep, which is appropriate here. Regards, -- Tanguy Ortolo -- System Information: Debian Release: wheezy/sid APT prefers testing APT policy: (990, 'testing'), (500, 'unstable'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Kernel: Linux 3.0.0-1-amd64 (SMP w/2 CPU cores) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash xdg-utils depends on no packages. Versions of packages xdg-utils recommends: ii libfile-mimeinfo-perl <none> ii x11-utils 7.6+4 ii x11-xserver-utils 7.6+3 Versions of packages xdg-utils suggests: ii gvfs-bin 1.8.2-2 -- no debconf information
--- xdg-screensaver.orig 2011-11-06 13:08:02.043310783 +0100 +++ xdg-screensaver 2011-11-06 13:16:09.024684848 +0100 @@ -961,9 +961,9 @@ detectDE # Consider "xscreensaver" a separate DE -xscreensaver-command -version 2> /dev/null | grep XScreenSaver > /dev/null && DE="xscreensaver" +xscreensaver-command -version 2> /dev/null | grep -q XScreenSaver && DE="xscreensaver" # Consider "gnome-screensaver" a separate DE -gnome-screensaver-command -q > /dev/null 2>&1 && DE="gnome_screensaver" +gnome-screensaver-command -q 2>&1 | grep -qv "not running" && DE="gnome_screensaver" echo $DE
