diff options
author | Chris Lumens <clumens@redhat.com> | 2008-11-24 09:46:53 -0500 |
---|---|---|
committer | Chris Lumens <clumens@redhat.com> | 2008-11-24 09:46:53 -0500 |
commit | 25d0c4212b89ce37461f4b3cff5cb72a6c0fe411 (patch) | |
tree | 77e560fcb7898dd3e790bfeb708fb79e5b9fd78b /image.py | |
parent | 1c091082de485332bbf50025a995bb7196647691 (diff) | |
download | anaconda-25d0c4212b89ce37461f4b3cff5cb72a6c0fe411.tar.gz anaconda-25d0c4212b89ce37461f4b3cff5cb72a6c0fe411.tar.xz anaconda-25d0c4212b89ce37461f4b3cff5cb72a6c0fe411.zip |
Make the required media dialog less wordy (#469557).
If you have a split media set for an Everything install, you end up with a
whole bunch of CDs that could be required. This could make the dialog scroll
off the bottom of the screen.
Diffstat (limited to 'image.py')
-rw-r--r-- | image.py | 27 |
1 files changed, 11 insertions, 16 deletions
@@ -235,22 +235,17 @@ def presentRequiredMediaMessage(anaconda): return reqcds.sort() - reqcdstr = "" - for cdnum in reqcds: - if cdnum == -99: # non-CD bits - continue - reqcdstr += "\t\t%s %s disc #%d\n" % (product.productName, product.productVersion, cdnum,) - - return anaconda.intf.messageWindow( _("Required Install Media"), - _("The software you have selected to " - "install will require the following discs:\n\n" - "%s\nPlease " - "have these ready before proceeding with " - "the installation. If you need to abort " - "the installation and exit please " - "select \"Reboot\".") % (reqcdstr,), - type="custom", custom_icon="warning", - custom_buttons=[_("_Reboot"), _("_Back"), _("_Continue")]) + reqcds = map(lambda disc: "#%s" % disc, filter(lambda disc: disc != -99, reqcds)) + reqcdstr = ", ".join(reqcds) + + return anaconda.intf.messageWindow(_("Required Install Media"), + _("The software you have selected to install will require the " + "following %s %s discs:\n\n%s\nPlease have these ready " + "before proceeding with the installation. If you need to " + "abort the installation and exit please select " + "\"Reboot\".") % (product.productName, product.productVersion, reqcdstr) + type="custom", custom_icon="warning", + custom_buttons=[_("_Reboot"), _("_Back"), _("_Continue")]) # Find an attached CD/DVD drive with media in it that contains packages, # and return that device name. |