[SCM] GUI front-end for Debian Live. branch, master, updated. d1f4be72fc9f4ff8d59eda63b42db319ad0754c0

[Chris Lamb]

The following commit has been merged in the master branch:
commit d1f4be72fc9f4ff8d59eda63b42db319ad0754c0
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Thu Aug 28 08:48:45 2008 +0100

    Try some alternative file managers to open the completed build window other than xdg-open.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index 24b494f..4a11202 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -91,8 +91,15 @@ class BuildController(object):
             if self.options.gnome_desktop_session_id != '-':
                 os.environ['GNOME_DESKTOP_SESSION_ID'] = self.options.gnome_desktop_session_id
 
-            cmd = ['su', pwd.getpwuid(self.uid)[0], '-c', 'xdg-open .']
-            subprocess.call(cmd)
+            # Try some file managers.
+            for manager in ('/usr/bin/xdg-open', '/usr/bin/pcmanfm'):
+                if not os.path.exists(manager):
+                    continue
+
+                cmd = ['su', pwd.getpwuid(self.uid)[0], '-c', '%s .' % manager]
+                if not subprocess.call(cmd):
+                    continue
+
             return DONE
 
         def ok_clean():
diff --git a/debian/changelog b/debian/changelog
index bdad9c2..59e2bd8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,12 @@
 live-magic (1.1) unstable; urgency=low
 
+  * Try some alternative file managers to open the completed build window other
+    than xdg-open.
   * Add translations:
     - Italian translation by Fabio Balzano (Closes: #496848)
     - Spanish translation by Fabio Balzano (Closes: #496857)
 
- -- Chris Lamb <chris at chris-lamb.co.uk>  Thu, 28 Aug 2008 05:21:24 +0100
+ -- Chris Lamb <chris at chris-lamb.co.uk>  Thu, 28 Aug 2008 08:47:48 +0100
 
 live-magic (1.0) unstable; urgency=low
 

-- 
GUI front-end for Debian Live.