On Fri, 2009-03-20 at 15:57 -0400, Chris Lumens wrote: > (1) When there's more than one system to choose from, display the name of the > device, its release string, and the label if it exists. > > (2) Return the right type when the user makes a selection from the combo box. Looks good except that not all formats have a label attr. > --- > rescue.py | 7 +++++-- > 1 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/rescue.py b/rescue.py > index 688266f..96f492b 100644 > --- a/rescue.py > +++ b/rescue.py > @@ -273,7 +273,10 @@ def runRescue(anaconda, instClass): > > devList = [] > for (device, relstr) in disks: > - devList.append(device.path) > + if device.format.label: if getattr(device.format, "label", None): > + devList.append("%s (%s) - %s" % (device.name, device.format.label, relstr)) > + else: > + devList.append("%s - %s" % (device.name, relstr)) > > (button, choice) = \ > ListboxChoiceWindow(screen, _("System to Rescue"), > @@ -286,7 +289,7 @@ def runRescue(anaconda, instClass): > if button == string.lower (_("Exit")): > root = None > else: > - root = disks[choice][0] > + root = disks[choice] > > rootmounted = 0 > _______________________________________________ Anaconda-devel-list mailing list Anaconda-devel-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/anaconda-devel-list