diff options
| author | Chris Lumens <clumens@redhat.com> | 2010-10-20 13:40:55 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2010-10-29 15:39:44 -0400 |
| commit | 513925ecab98f2a63c0330f6fa909da674cbbf66 (patch) | |
| tree | 74d8faa1540dee54dc65bbd412ac4bec0a4c608f /pyanaconda/yuminstall.py | |
| parent | 405b38a308728615c315dce48eaffaf5e7f1bfd4 (diff) | |
| download | anaconda-513925ecab98f2a63c0330f6fa909da674cbbf66.tar.gz anaconda-513925ecab98f2a63c0330f6fa909da674cbbf66.tar.xz anaconda-513925ecab98f2a63c0330f6fa909da674cbbf66.zip | |
Remove presentRequiredMediaMessage and related code.
You've either got the one image (in which case you got into the installer),
or you don't (in which case you were kicked out earlier).
Diffstat (limited to 'pyanaconda/yuminstall.py')
| -rw-r--r-- | pyanaconda/yuminstall.py | 20 |
1 files changed, 1 insertions, 19 deletions
diff --git a/pyanaconda/yuminstall.py b/pyanaconda/yuminstall.py index cd06b7493..eed40fd0e 100644 --- a/pyanaconda/yuminstall.py +++ b/pyanaconda/yuminstall.py @@ -1106,7 +1106,7 @@ class AnacondaYum(YumSorter): spaceprob = to_unicode(spaceprob) fileprob = to_unicode(fileprob) - if len(self.anaconda.backend.getRequiredMedia()) > 1 or self.anaconda.upgrade: + if self.anaconda.upgrade: intf.detailedMessageWindow(_("Error Running Transaction"), msg, spaceprob + "\n" + fileprob, type="custom", custom_icon="error", custom_buttons=[_("_Exit installer")]) @@ -1584,21 +1584,6 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon return DISPATCH_BACK dscb.pop() - - if anaconda.mediaDevice and not anaconda.ksdata: - rc = presentRequiredMediaMessage(anaconda) - if rc == 0: - rc2 = anaconda.intf.messageWindow(_("Reboot?"), - _("The system will be rebooted now."), - type="custom", custom_icon="warning", - custom_buttons=[_("_Back"), _("_Reboot")]) - if rc2 == 1: - sys.exit(0) - else: - return DISPATCH_BACK - elif rc == 1: # they asked to go back - return DISPATCH_BACK - self.ayum.dsCallback = None def doPreInstall(self, anaconda): @@ -2042,9 +2027,6 @@ reposdir=/etc/anaconda.repos.d,/tmp/updates/anaconda.repos.d,/tmp/product/anacon def writeConfiguration(self): return - def getRequiredMedia(self): - return self.ayum.tsInfo.reqmedia.keys() - class DownloadHeaderProgress: def __init__(self, intf, ayum=None): window = intf.progressWindow(_("Installation Starting"), |