--- a/patches/moovida-04-pidof.diff Sat Dec 04 21:59:36 2010 +0000
+++ b/patches/moovida-04-pidof.diff Tue Dec 07 21:59:21 2010 +0000
@@ -1,5 +1,5 @@
---- elisa-1.0.6/elisa/core/utils/misc.py-orig 2009-08-06 11:25:58.307494000 -0500
-+++ elisa-1.0.6/elisa/core/utils/misc.py 2009-08-06 11:26:55.181318000 -0500
+--- elisa-1.0.6/elisa/core/utils/misc.py-orig 2009-09-29 19:21:20.219682862 -0500
++++ elisa-1.0.6/elisa/core/utils/misc.py 2009-09-29 19:22:43.403454681 -0500
@@ -25,6 +25,7 @@ reasonnably small.
import platform
import os, re
@@ -8,7 +8,7 @@
from twisted.trial.unittest import SkipTest
-@@ -209,17 +210,30 @@ def get_os_name():
+@@ -209,17 +210,33 @@ def get_os_name():
else:
return platform.system().lower()
@@ -38,13 +38,16 @@
+ stderr=subprocess.STDOUT,
+ stdout=subprocess.PIPE,
+ close_fds=True).communicate()[0]
++ except Exception, e:
++ output = ""
++
+ finally:
+ lock.release()
+
return [int(pid) for pid in output.split()]
def get_user_desktop_name():
-@@ -255,7 +269,7 @@ def get_user_desktop_name():
+@@ -255,7 +272,7 @@ def get_user_desktop_name():
'xfwm4': 'xfce',
}
for prog, name in progs.iteritems():