diff options
| -rw-r--r-- | ChangeLog | 13 | ||||
| -rw-r--r-- | iw/progress_gui.py | 2 | ||||
| -rw-r--r-- | iw/release_notes.py | 2 | ||||
| -rw-r--r-- | partedUtils.py | 5 | ||||
| -rw-r--r-- | textw/partition_text.py | 2 | ||||
| -rw-r--r-- | textw/upgrade_bootloader_text.py | 3 |
6 files changed, 22 insertions, 5 deletions
@@ -44,6 +44,8 @@ * partErrors.py (LabelError): Add from rhel5-branch. + * partedUtils.py (checkDasdFmt): Fix indexing into dasd dictionary. + * syslogd.py (Syslogd.__init__): Remove pointless code. * text.py (InstallInterface.helpWindow): Pass the correct number of @@ -52,6 +54,17 @@ * vnc.py: Fix minor nitpicking errors. + * iw/progress_gui.py (InstallProgressWindow.set_fraction): Fix + progress bar format string. + + * iw/release_notes.py (ReleaseNotesViewer.load): Don't traceback in + error reporting. + + * textw/partition_text.py (PartitionWindow.editLVRequest): Use the + right variable name when printing a name already in use. + + * textw/upgrade_bootloader_text.py: Import the logging system. + 2007-09-19 Jeremy Katz <katzj@redhat.com> * livecd.py (LiveCDImageMethod.unmountNonFstabDirs): Fix syntax error. diff --git a/iw/progress_gui.py b/iw/progress_gui.py index 46d1c3531..de55b8759 100644 --- a/iw/progress_gui.py +++ b/iw/progress_gui.py @@ -48,7 +48,7 @@ class InstallProgressWindow (InstallWindow): if pct - cur > self._updateChange: self.progress.set_fraction(pct) if self._showPercentage: - self.progress.set_text("%d %" %(pct * 100,)) + self.progress.set_text("%d %%" %(pct * 100,)) self.processEvents() def set_label(self, txt): diff --git a/iw/release_notes.py b/iw/release_notes.py index 15e6d5c45..e33d4dbdd 100644 --- a/iw/release_notes.py +++ b/iw/release_notes.py @@ -134,7 +134,7 @@ class ReleaseNotesViewer: try: f = self.openURI(uri) except OSError: - self.log("Failed to open %s" % (link,)) + self.log("Failed to open %s" % (uri,)) return if f is not None: diff --git a/partedUtils.py b/partedUtils.py index 5685cef96..6d776539b 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -316,8 +316,9 @@ def checkDasdFmt(disk, intf): if intf: try: + device = disk.dev.path[5:] devs = isys.getDasdDevPort() - dev = "/dev/%s (%s)" %(disk.dev.path[5:], devs[device]) + dev = "/dev/%s (%s)" %(device, devs[device]) except Exception, e: log.critical("exception getting dasd dev ports: %s" %(e,)) dev = "/dev/%s" %(disk.dev.path[5:],) @@ -673,7 +674,7 @@ class DiskSet: if rhpl.getArch() in ('s390', 's390x'): return - if DiskSet.dmList or []: + if DiskSet.dmList: dmraid.stopAllRaid(DiskSet.dmList) DiskSet.dmList = None diff --git a/textw/partition_text.py b/textw/partition_text.py index ef99143cd..6b8789499 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -1245,7 +1245,7 @@ class PartitionWindow: self.intf.messageWindow(_("Illegal logical volume name"), _("The logical volume name \"%s\" " "is already in use. Please " - "pick another.") % (lvname,), + "pick another.") % (lvn,), custom_icon="error") continue diff --git a/textw/upgrade_bootloader_text.py b/textw/upgrade_bootloader_text.py index a2eaabf33..55425baa9 100644 --- a/textw/upgrade_bootloader_text.py +++ b/textw/upgrade_bootloader_text.py @@ -21,6 +21,9 @@ from flags import flags import string import checkbootloader +import logging +log = logging.getLogger("anaconda") + class UpgradeBootloaderWindow: def _ideToLibata(self, rootPath): try: |