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

[Chris Lamb]

The following commit has been merged in the master branch:
commit 94fad136c2d0ca82cc8c31681d3b1eb95b8795c7
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Jul 8 22:30:05 2009 +0100

    Only delete build directory if we created it. This is not only safer, but fixes a weird bug where Live Magic deletes its own DebianLive Python module when run from Git (as that directory is considered a build directory).

diff --git a/LiveMagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
index 23646be..e96b057 100644
--- a/LiveMagic/controllers/wizard.py
+++ b/LiveMagic/controllers/wizard.py
@@ -37,6 +37,8 @@ class WizardController(object):
         elif len(os.listdir(build_dir)) != 0:
             build_dir = os.path.join(build_dir, 'DebianLive')
 
+        existed_before = os.path.exists(build_dir)
+
         # Use cdebootstrap in some situations
         if os.path.exists('/usr/bin/cdebootstrap') and \
                                 data['distribution'] in ('etch', 'lenny'):
@@ -79,8 +81,10 @@ class WizardController(object):
 
             self.view.do_undim_wizard()
             os.chdir('..')
+
             try:
-                shutil.rmtree(self.model.dir)
+                if not existed_before:
+                    shutil.rmtree(self.model.dir)
             except:
                 # Tree may not exist if we cancelled build
                 pass
diff --git a/debian/changelog b/debian/changelog
index fd1615b..e1bffd5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+live-magic (1.7) UNRELEASED; urgency=low
+
+  * Only delete build directory if we created it. This is not only safer, but
+    fixes a weird bug where Live Magic deletes its own DebianLive Python module
+    when run from Git (as that directory is considered a build directory).
+
+ -- Chris Lamb <lamby at debian.org>  Wed, 08 Jul 2009 22:26:23 +0100
+
 live-magic (1.6) unstable; urgency=low
 
   * Don't assume /etc/debian_version will contain the string "5.0\n" for the

-- 
GUI front-end for Debian Live.