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

[Chris Lamb]

The following commit has been merged in the master branch:
commit 4c33ae4c9ead0dcd486c8749366c24aed989c749
Author: Chris Lamb <chris at chris-lamb.co.uk>
Date:   Sat Aug 9 06:04:54 2008 +0100

    Don't show distribution page when running on Lenny as stable.
    
    Signed-off-by: Chris Lamb <chris at chris-lamb.co.uk>

diff --git a/LiveMagic/views/wizard.py b/LiveMagic/views/wizard.py
index eb9aa03..3b3689e 100644
--- a/LiveMagic/views/wizard.py
+++ b/LiveMagic/views/wizard.py
@@ -61,10 +61,23 @@ class WizardView(object):
             [gtk.ASSISTANT_PAGE_CONTENT] * (notebook.get_n_pages() - 2) + \
             [gtk.ASSISTANT_PAGE_CONFIRM]
 
+        hide_distribution = False
+        try:
+            f = open('/etc/debian_version')
+            if f.read(4) == "5.0\n":
+                hide_distribution = True
+            f.close()
+        except:
+            pass
+
         for i in range(notebook.get_n_pages()):
-            # Only show architecture page if using amd64
-            if notebook.get_n_pages() - 4 == i and \
+            if i == notebook.get_n_pages() - 4 and \
                 self.controller.get_host_architecture() != 'amd64':
+                # Only show architecture page if using amd64
+                continue
+
+            if i == 2 and hide_distribution:
+                # Hide distribution when running Lenny as stable.
                 continue
 
             page = notebook.get_nth_page(i)
diff --git a/debian/changelog b/debian/changelog
index 8349b71..90ae0f8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ live-magic (1.0) unstable; urgency=low
 
   * 1.0 release for Lenny.
   * Set default distribution to Lenny.
+  * Don't show distribution page when running Lenny as stable.
 
  -- Chris Lamb <chris at chris-lamb.co.uk>  Sat, 09 Aug 2008 02:41:53 +0100
 

-- 
GUI front-end for Debian Live.