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

[Chris Lamb]

The following commit has been merged in the master branch:
commit 7006d497fbedfdee149c78493d299f7512b6e7a2
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Jan 28 23:43:34 2009 +0000

    Correct (and clarify) logic of file manager fallback.
    
    Signed-off-by: Chris Lamb <lamby at debian.org>

diff --git a/LiveMagic/controllers/build.py b/LiveMagic/controllers/build.py
index e58b3f8..211d10f 100644
--- a/LiveMagic/controllers/build.py
+++ b/LiveMagic/controllers/build.py
@@ -98,8 +98,8 @@ class BuildController(object):
 
                 cmd = ['su', pwd.getpwuid(self.uid)[0], '-c', '%s "%s"' % \
                     (manager, os.path.abspath(os.curdir))]
-                if not subprocess.call(cmd):
-                    continue
+                if subprocess.call(cmd) == 0:
+                    break
 
             return DONE
 
diff --git a/debian/changelog b/debian/changelog
index 190e208..ae2907c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ live-magic (1.5) unstable; urgency=low
   * Re-order import of GTK and PyGTK as GTK requires that PyGTK is imported
     first. This is required for compatibility with python-gtk2 2.13 (currently
     in experimental). Thanks to Michael Vogt.
+  * Correct (and clarify) logic of file manager fallback.
   * Add missing 'ignore-system-defaults' and 'color' constructor arguments.
 
  -- Chris Lamb <lamby at debian.org>  Sat, 10 Jan 2009 04:01:59 +0000

-- 
GUI front-end for Debian Live.