merge taroon branch. mostly package bits, but a lot of other misc stuff

and cleanups in here too

5 files changed, 46 insertions, 24 deletions

diff --git a/textw/language_text.py b/textw/language_text.py
index f113f2d7c..1b68057df 100644
--- a/textw/language_text.py
+++ b/textw/language_text.py
@@ -57,7 +57,8 @@ class LanguageWindow:
         if (flags.setupFilesystems and
             instLanguage.getFontFile(choice) == "bterm"
             and not isys.isPsudoTTY(0)
-            and not flags.serial):
+            and not flags.serial
+            and not isys.isVioConsole()):
             # bterm to the rescue...  have to shut down the screen and
             # create a new one, though (and do a sleep)
             log("starting bterm")
diff --git a/textw/network_text.py b/textw/network_text.py
index ef22b6093..07d7f710f 100644
--- a/textw/network_text.py
+++ b/textw/network_text.py
@@ -23,6 +23,7 @@ from network import sanityCheckHostname
 from snack import *
 from constants_text import *
 from rhpl.translate import _
+from rhpl.log import log
 
 
 def badIPDisplay(screen, the_ip):
@@ -54,8 +55,13 @@ class NetworkDeviceWindow:
     def runScreen(self, screen, network, dev, showonboot=1):
         boot = dev.get("bootproto")
         onboot = dev.get("onboot")
-        onbootIsOn = ((dev == network.available().values()[0] and not onboot)
-                      or onboot == "yes")
+
+        devnames = self.devices.keys()
+        devnames.sort()
+        if devnames.index(dev.get("DEVICE")) == 0:
+            onbootIsOn = 1
+        else:
+            onbootIsOn = (onboot == "yes")
         if not boot:
             boot = "dhcp"
 
@@ -118,9 +124,9 @@ class NetworkDeviceWindow:
         while 1:
             result = toplevel.run()
             rc = bb.buttonPressed (result)
-            screen.popWindow()
 
             if rc == TEXT_BACK_CHECK:
+                screen.popWindow()
                 return INSTALL_BACK
 
             if self.onbootCb.selected() != 0:
@@ -158,16 +164,17 @@ class NetworkDeviceWindow:
 
             break
 
+        screen.popWindow()
         return INSTALL_OK
 
 
     def __call__(self, screen, network, dir, intf, showonboot=1):
 
-        devices = network.available()
-        if not devices:
+        self.devices = network.available()
+        if not self.devices:
             return INSTALL_NOOP
 
-        list = devices.keys()
+        list = self.devices.keys()
         list.sort()
         devLen = len(list)
         if dir == 1:
@@ -176,7 +183,8 @@ class NetworkDeviceWindow:
             currentDev = devLen - 1
 
         while currentDev < devLen and currentDev >= 0:
-            rc = self.runScreen(screen, network, devices[list[currentDev]], showonboot)
+            rc = self.runScreen(screen, network,
+                                self.devices[list[currentDev]], showonboot)
             if rc == INSTALL_BACK:
                 currentDev = currentDev - 1
             else:
@@ -252,9 +260,9 @@ class NetworkGlobalWindow:
         while 1:
             result = toplevel.run()
             rc = bb.buttonPressed (result)
-            screen.popWindow()
 
             if rc == TEXT_BACK_CHECK:
+                screen.popWindow()
                 return INSTALL_BACK
 
             val = gwEntry.value()
@@ -281,7 +289,8 @@ class NetworkGlobalWindow:
                 continue
             network.ternaryNS = val
             break
-        
+
+        screen.popWindow()        
         return INSTALL_OK
         
 
@@ -352,9 +361,9 @@ class HostnameWindow:
         while 1:
             result = toplevel.run()
             rc = bb.buttonPressed(result)
-            screen.popWindow()
             
             if rc == TEXT_BACK_CHECK:
+                screen.popWindow()
                 return INSTALL_BACK
 
             if radio.getSelection() != "manual":
@@ -363,13 +372,13 @@ class HostnameWindow:
             else:
                 hname = string.strip(hostEntry.value())
                 if len(hname) == 0:
-                    ButtonChoiceWindow(_("Invalid Hostname"),
+                    ButtonChoiceWindow(screen, _("Invalid Hostname"),
                                        _("You have not specified a hostname."),
                                        buttons = [ _("OK") ])
                     continue
                 neterrors = sanityCheckHostname(hname)
                 if neterrors is not None:
-                    ButtonChoiceWindow(_("Invalid Hostname"),
+                    ButtonChoiceWindow(screen, _("Invalid Hostname"),
                                        _("The hostname \"%s\" is not valid "
                                          "for the following reason:\n\n%s")
                                        %(hname, neterrors),
@@ -380,6 +389,7 @@ class HostnameWindow:
                 network.hostname = hname
             break
 
+        screen.popWindow()
         return INSTALL_OK
             
 
diff --git a/textw/packages_text.py b/textw/packages_text.py
index b972dd572..c539c386f 100644
--- a/textw/packages_text.py
+++ b/textw/packages_text.py
@@ -15,6 +15,7 @@ import rpm
 from snack import *
 from constants_text import *
 from rhpl.translate import _
+from hdrlist import orderPackageGroups
 
 class PackageGroupWindow:
 
@@ -43,9 +44,13 @@ class PackageGroupWindow:
 	origSelection = grpset.getSelectionState()
 
         ct = CheckboxTree(height = 8, scroll = 1)
-        for group in grpset.groups.values():
-            if not group.hidden:
-                ct.append(group.name, group, group.isSelected(justManual = 1))
+
+        (parlist, pardict) = orderPackageGroups(grpset)
+        for par in parlist:
+            for grp in pardict[par]:
+                if grp.hidden:
+                    continue
+                ct.append(grp.name, grp, grp.isSelected(justManual = 1))
 
         cb = Checkbox (_("Select individual packages"), 
 			    not dispatch.stepInSkipList("indivpackage"))
diff --git a/textw/partition_text.py b/textw/partition_text.py
index 81f050296..487daa725 100644
--- a/textw/partition_text.py
+++ b/textw/partition_text.py
@@ -178,7 +178,13 @@ class PartitionWindow:
                                    [LEFT, RIGHT, RIGHT, RIGHT, LEFT, LEFT])
                                     
                 else:
-                    self.lb.append(["%s%s" %(indent, devify(get_partition_name(part))),
+                    dev = devify(get_partition_name(part))
+                    # save some space per #90838
+                    if dev.startswith("/dev/iseries/"):
+                        dev = dev[13:]
+                    elif dev.startswith("/dev/"):
+                        dev = dev[5:]
+                    self.lb.append(["%s%s" %(indent, dev),
                                     "%d" %(start),
                                     "%d" %(end),
                                     "%dM" %(size),
diff --git a/textw/xconfig_text.py b/textw/xconfig_text.py
index 405d53a6d..a99b85f51 100644
--- a/textw/xconfig_text.py
+++ b/textw/xconfig_text.py
@@ -84,7 +84,7 @@ class XCustomWindow:
             print "Invalid widget in xconfig_text::desktopCB"
 
 
-    def __call__(self, screen, xsetup, monitor, videocard, desktop, comps,
+    def __call__(self, screen, xsetup, monitor, videocard, desktop, grpset,
                  instClass, instPath):
 
         self.instPath = instPath
@@ -113,11 +113,11 @@ class XCustomWindow:
 			 "1920x1440", "2048x1536"]
 	       
         #--If both KDE and GNOME are selected
-        if comps:
-            gnomeSelected = (comps.packages.has_key('gnome-session')
-                             and comps.packages['gnome-session'].selected)
-            kdeSelected = (comps.packages.has_key('kdebase')
-                           and comps.packages['kdebase'].selected)
+        if grpset:
+            gnomeSelected = (grpset.hdrlist.has_key('gnome-session')
+                             and grpset.hdrlist['gnome-session'].isSelected())
+            kdeSelected = (grpset.hdrlist.has_key('kdebase')
+                           and grpset.hdrlist['kdebase'].isSelected())
         else:
             gnomeSelected = 0
             kdeSelected = 0
@@ -619,7 +619,7 @@ class XConfigWindowCard:
 		text = _("Your system will be setup to "
 		  "use the frame buffer driver for "
 		  "the X Window System.  If you do "
-		  "not want setup the X Window "
+		  "not want to setup the X Window "
 		  "System, choose "
 		  "'Skip X Configuration' below.")