Merge lp:~jamesodhunt/update-manager/fix-for-bug-883618 into lp:update-manager

[James Hunt]

  [ James Hunt ]
  * Only attempt to stop screensaver if DISPLAY set, and throw away
    xdg-screensaver output. (LP: #883618)

=== modified file 'DistUpgrade/DistUpgradeQuirks.py'
--- DistUpgrade/DistUpgradeQuirks.py	2012-03-05 08:24:48 +0000
+++ DistUpgrade/DistUpgradeQuirks.py	2012-03-06 15:17:20 +0000
@@ -816,11 +816,11 @@
             logging.debug("killing gnome-screensaver")
             subprocess.call(["killall", "-q", "gnome-screensaver"])
     def _pokeScreensaver(self):
-        if os.path.exists("/usr/bin/xdg-screensaver"):
+        if os.path.exists("/usr/bin/xdg-screensaver") and os.environ.get('DISPLAY') :
             logging.debug("setup poke timer for the scrensaver")
             try:
                 self._poke = subprocess.Popen(
-                    "while true; do /usr/bin/xdg-screensaver reset; sleep 30; done",
+                    "while true; do /usr/bin/xdg-screensaver reset >/dev/null 2>&1; sleep 30; done",
                     shell=True)
                 atexit.register(self._stopPokeScreensaver)
             except:

=== modified file 'debian/changelog'
--- debian/changelog	2012-03-05 08:24:48 +0000
+++ debian/changelog	2012-03-06 15:17:20 +0000
@@ -14,6 +14,10 @@
   * Improve the warning issued when i8xx graphics hardware is
     detected. (LP: #941172)
 
+  [ James Hunt ]
+  * Only attempt to stop screensaver if DISPLAY set, and throw away
+    xdg-screensaver output. (LP: #883618)
+
  -- Michael Vogt <[e-mail]>  Mon, 05 Mar 2012 09:15:40 +0100
 
 update-manager (1:0.156.7) precise; urgency=low