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

Chris Lamb chris at chris-lamb.co.uk
Fri Apr 11 02:14:00 UTC 2008


The following commit has been merged in the master branch:
commit a5f99a478b89c485a3b6a6995d3124d11adcad59
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Apr 11 03:10:38 2008 +0100

    controllers/wizard.py: Tidy
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/LiveMagic/controllers/wizard.py b/LiveMagic/controllers/wizard.py
index d28bdc6..ceaff45 100644
--- a/LiveMagic/controllers/wizard.py
+++ b/LiveMagic/controllers/wizard.py
@@ -6,9 +6,7 @@ from DebianLive import Config, utils
 class WizardController(object):
 
     def on_wizard_apply(self, _):
-
         build_dir = utils.get_build_dir()
-
         data = self.view.get_wizard_completed_details()
 
         # Use cdebootstrap if available
@@ -16,23 +14,18 @@ class WizardController(object):
             data['bootstrap'] = 'cdebootstrap'
 
         self.model = Config(build_dir, **data)
-        self.model.save()
 
         self.view.do_dim_wizard()
-        self.do_show_build_window(self.on_wizard_build_completed)
+        self.do_show_build_window(lambda: gtk.main_quit())
 
     def on_wizard_expert_mode_selected(self, _):
         self.view.do_hide_wizard()
         self.view.do_show_main_window()
 
-    def on_wizard_build_completed(self):
-        gtk.main_quit()
-
     def get_suggested_mirror(self):
         s = utils.SourcesList()
         return s.get_mirror()
 
     def on_wizard_cancel(self, *args):
-        ret = self.view.do_show_wizard_cancel_confirm_window()
-        if ret:
+        if self.view.do_show_wizard_cancel_confirm_window():
             gtk.main_quit()

-- 
GUI front-end for Debian Live.



More information about the debian-live-changes mailing list