diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-07-08 03:00:53 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-07-08 03:00:53 +0000 |
| commit | 459119c94529602d08de465b7ebfa4871d328081 (patch) | |
| tree | 369a7eb643938d6d51ef6f2d0c46561e61dcc0ae /iw | |
| parent | 390977d3ee0ebc010168ce04573f63ae15458718 (diff) | |
| download | anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.gz anaconda-459119c94529602d08de465b7ebfa4871d328081.tar.xz anaconda-459119c94529602d08de465b7ebfa4871d328081.zip | |
massive merge from taroon branch. changes are all over the place, but a
summary of looking through the diff is
* clean up warnings, we build with -Wall -Werror here too
* product.img stuff
* max logical partitions enforcement
* 1 TB max fs size
* ethtool stuff
* autopart in kickstart
* driver disk fixes
* RHEL upgrade stuff
* network driver disks
* variant pkgorder/tree splitting
Diffstat (limited to 'iw')
| -rw-r--r-- | iw/package_gui.py | 2 | ||||
| -rw-r--r-- | iw/progress_gui.py | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/iw/package_gui.py b/iw/package_gui.py index 9468e3056..578566e97 100644 --- a/iw/package_gui.py +++ b/iw/package_gui.py @@ -979,7 +979,7 @@ class PackageSelectionWindow (InstallWindow): pixname = string.lower(comp.id) + ".png" fn = self.ics.findPixmap("comps/"+pixname) if not fn: - print "could not load pix ",pixname + log("could not load pix: %s " %(pixname,)) pix = None else: rawpix = gtk.gdk.pixbuf_new_from_file(fn) diff --git a/iw/progress_gui.py b/iw/progress_gui.py index 00125e862..a1d75807c 100644 --- a/iw/progress_gui.py +++ b/iw/progress_gui.py @@ -145,9 +145,10 @@ class InstallProgressWindow (InstallWindow): self.pixcurnum = num + 1 self.pixtimer.reset() - self.curPackage["package"].set_text ("%s-%s-%s" % (header[rpm.RPMTAG_NAME], - header[rpm.RPMTAG_VERSION], - header[rpm.RPMTAG_RELEASE])) + self.curPackage["package"].set_text ("%s-%s-%s.%s" % (header[rpm.RPMTAG_NAME], + header[rpm.RPMTAG_VERSION], + header[rpm.RPMTAG_RELEASE], + header[rpm.RPMTAG_ARCH])) size = str (header[rpm.RPMTAG_SIZE] / 1024) if len (size) > 3: size = size [0:len(size) - 3] + ',' + size[len(size) - 3:] |