diff options
| -rw-r--r-- | fsset.py | 2 | ||||
| -rw-r--r-- | image.py | 2 | ||||
| -rw-r--r-- | lvm.py | 2 | ||||
| -rw-r--r-- | partIntfHelpers.py | 7 | ||||
| -rw-r--r-- | text.py | 4 | ||||
| -rw-r--r-- | yuminstall.py | 15 |
6 files changed, 15 insertions, 17 deletions
@@ -2149,7 +2149,7 @@ class FileSystemSetEntry: self.resizeOrigSize = size def getResizeTarget (self): - return self.targetsize + return self.resizeTargetSize def isMounted (self): return self.mountcount > 0 @@ -158,7 +158,7 @@ def mountDirectory(isodir, methodstr, messageWindow): "device like LVM or RAID, or if there was a " "problem mounting a partition. Click exit " "to abort the installation.") - % (self.device,), type="custom", custom_icon="error", + % (device,), type="custom", custom_icon="error", custom_buttons=[_("_Exit")]) sys.exit(0) @@ -221,7 +221,7 @@ def lvresize(lvname, vgname, size): except: rc = 1 if rc: - raise LVMResizeError(vgname, lvname) + raise LVResizeError(vgname, lvname) def vgcreate(vgname, PESize, nodes): diff --git a/partIntfHelpers.py b/partIntfHelpers.py index 872c4ef9d..9deb4cf09 100644 --- a/partIntfHelpers.py +++ b/partIntfHelpers.py @@ -194,7 +194,7 @@ def doDeletePartitionByRequest(intf, requestlist, partition, intf.messageWindow(_("Unable To Delete"), _("You cannot delete this partition:\n\n") + state, custom_icon="error") - return (None, None) + return 0 if confirm and not confirmDeleteRequest(intf, request): return 0 @@ -267,8 +267,7 @@ def doDeletePartitionsByDevice(intf, requestlist, diskset, device, part = partedUtils.get_partition_by_name(diskset.disks, req.device) rc = doDeletePartitionByRequest(intf, requestlist, part, confirm=0, quiet=1) - # not sure why it returns both '0' and '(None, None)' on failure - if not rc or rc == (None, None): + if not rc: pass except: pass @@ -359,7 +358,7 @@ def doEditPartitionByRequest(intf, requestlist, part): _("You cannot edit this " "partition, as it is an extended partition " "which contains %s") %(ret), custom_icon="error") - return 0 + return (None, None) name = partedUtils.get_partition_name(part) request = requestlist.getRequestByDeviceName(name) @@ -399,8 +399,8 @@ class InstallInterface: def detailedMessageWindow(self, title, text, longText=None, type="ok", default=None, custom_icon=None, custom_buttons=[]): - return messageWindow(title, text, type, default, custom_icon, - custom_buttons) + return self.messageWindow(title, text, type, default, custom_icon, + custom_buttons) def entryWindow(self, title, text, prompt, entrylength = None): (res, value) = EntryWindow(self.screen, title, text, [prompt]) diff --git a/yuminstall.py b/yuminstall.py index 8a8b07944..b606af37a 100644 --- a/yuminstall.py +++ b/yuminstall.py @@ -23,7 +23,7 @@ import sys import os import os.path import shutil -import timer +import time import warnings import types import locale @@ -387,12 +387,11 @@ class AnacondaYum(YumSorter): self.currentMedia = discnum break - if not done: - self.anaconda.intf.messageWindow(_("Wrong Disc"), - _("That's not the correct %s disc.") - % (productName,)) - isys.umount(self.tree) - isys.ejectCdrom(self.anaconda.mediaDevice) + self.anaconda.intf.messageWindow(_("Wrong Disc"), + _("That's not the correct %s disc.") + % (productName,)) + isys.umount(self.tree) + isys.ejectCdrom(self.anaconda.mediaDevice) except: self.anaconda.intf.messageWindow(_("Error"), _("Unable to access the disc.")) @@ -567,7 +566,7 @@ class AnacondaYum(YumSorter): delay = 0.25*(2**(obj.tries-1)) if delay > 1: - w = anaconda.intf.waitWindow(_("Retrying"), _("Retrying package download...")) + w = self.anaconda.intf.waitWindow(_("Retrying"), _("Retrying package download...")) time.sleep(delay) w.pop() else: |