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

[Chris Lamb]

The following commit has been merged in the master branch:
commit a7954101fed47b69638314607332fb2363933149
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Fri Apr 11 00:57:35 2008 +0100

    Only ask architecture question on amd64
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/LiveMagic/controllers/main.py b/LiveMagic/controllers/main.py
index 55363cd..7dfe51d 100644
--- a/LiveMagic/controllers/main.py
+++ b/LiveMagic/controllers/main.py
@@ -1,5 +1,7 @@
 import gtk
 
+import commands
+
 class MainController(object):
     def __init__(self, args):
         #self.model.attach_load_observer(self.notify_load)
@@ -80,3 +82,8 @@ class MainController(object):
 
     def set_window_main_sensitive(self):
         self.view.do_show_main_window(True)
+
+    def get_host_architecture(self):
+        status, output = commands.getstatusoutput('dpkg --print-architecture')
+        assert status == 0
+        return output
diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index bad7158..07ece9d 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -36,6 +36,11 @@ class WizardView(object):
             [gtk.ASSISTANT_PAGE_CONFIRM]
 
         for i in range(notebook.get_n_pages()):
+            # Only show architecture page if using amd64
+            if notebook.get_n_pages() - 2 == i and \
+                self.controller.get_host_architecture() != 'amd64':
+                continue
+
             page = notebook.get_nth_page(i)
             page.unparent()
             self.asst.append_page(page)
@@ -58,20 +63,23 @@ class WizardView(object):
         self.asst.hide()
 
     def get_wizard_completed_details(self):
-        data = {}
-
         def get_active(name):
             for button in self[name].get_group():
                 if button.get_active() == True:
                     return button.get_name().split('_')[2]
 
-        return {
+        data = {
             'packages_lists' : get_active('radio_desktop_gnome'),
-            'binary_images' : get_active('radio_media_usb'),
-            'architecture' : get_active('radio_architecture_i386'),
+            'binary_images' : get_active('radio_media_iso'),
+            'distribution' : get_active('radio_distribution_stable'),
             'mirror' : self['combobox_mirror'].get_active_text()
         }
 
+        if self.controller.get_host_architecture() == 'amd64':
+            data['architecture'] = get_active('radio_architecture_i386')
+
+        return data
+
     def do_show_wizard_cancel_confirm_window(self):
         dialog = gtk.MessageDialog(
             parent=self.asst,
diff --git a/TODO b/TODO
index 97329ae..d551dab 100644
--- a/TODO
+++ b/TODO
@@ -33,8 +33,6 @@ Wizard
 
  * Pressing 'ENTER' on fields moves to next page.
 
- * Only ask architecture question on amd64?
-
  * Add boolean for whether to use mirror as LH_MIRROR_BINARY mirror.
 
 Expert mode

-- 
GUI front-end for Debian Live.