diff options
| author | Jeremy Katz <katzj@redhat.com> | 2003-06-23 19:02:38 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2003-06-23 19:02:38 +0000 |
| commit | c8c0190205336f69c1a94f890a28a3e040565a97 (patch) | |
| tree | e14cbf45307c02955d4e358dfb7e584026346953 /packages.py | |
| parent | d1636e475e29facfa7c08db38d4845a9bfe682e7 (diff) | |
| download | anaconda-c8c0190205336f69c1a94f890a28a3e040565a97.tar.gz anaconda-c8c0190205336f69c1a94f890a28a3e040565a97.tar.xz anaconda-c8c0190205336f69c1a94f890a28a3e040565a97.zip | |
merge from taroon. highlights of this time around
* ppc boot constraints
* md5 endianness
* don't prompt to save tracebacks to a floppy without a floppy
* autopart for kickstart
* network configuration in the loader if vnc/display case
Diffstat (limited to 'packages.py')
| -rw-r--r-- | packages.py | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/packages.py b/packages.py index 071a1fa21..7c8cb236e 100644 --- a/packages.py +++ b/packages.py @@ -321,7 +321,8 @@ class InstallCallback: self.progress.setPackageScale(0, 1) self.instLog.write (self.modeText % (h[rpm.RPMTAG_NAME], h[rpm.RPMTAG_VERSION], - h[rpm.RPMTAG_RELEASE])) + h[rpm.RPMTAG_RELEASE], + h[rpm.RPMTAG_ARCH])) self.instLog.flush () self.rpmFD = -1 @@ -786,9 +787,9 @@ def doInstall(method, id, intf, instPath): # dup'd when we go out of scope if upgrade: - modeText = _("Upgrading %s-%s-%s.\n") + modeText = _("Upgrading %s-%s-%s.%s.\n") else: - modeText = _("Installing %s-%s-%s.\n") + modeText = _("Installing %s-%s-%s.%s.\n") errors = rpmErrorClass(instLog) pkgTimer = timer.Timer(start = 0) @@ -1094,12 +1095,13 @@ def doPostInstall(method, id, intf, instPath): h = ts.hdrFromFdno(fd) os.close(fd) if upgrade: - text = _("Upgrading %s-%s-%s.\n") + text = _("Upgrading %s-%s-%s.%s.\n") else: - text = _("Installing %s-%s-%s.\n") + text = _("Installing %s-%s-%s.%s.\n") instLog.write(text % (h['name'], h['version'], - h['release'])) + h['release'], + h['arch'])) os.unlink(id.compspkg) del ts |