--- cdrom.image/updates/packages.py 2005/08/12 23:03:02 1.1 +++ cdrom.image/updates/packages.py 2005/08/13 03:51:26 1.2 @@ -1277,18 +1277,13 @@ def doPostInstall(method, id, intf, inst lines = [] for p in id.grpset.hdrlist.values(): if not p.isSelected(): - mi = ts.dbMatch('name', p.hdr[rpm.RPMTAG_NAME]) - if mi is not None: - for f in ts.dbMatch('name', p.hdr[rpm.RPMTAG_NAME]): - score1 = rhpl.arch.score(p.hdr[rpm.RPMTAG_ARCH]) - score2 = rhpl.arch.score(f[rpm.RPMTAG_ARCH]) - - if score1 == score2 and rpm.versionCompare(p.hdr, f) == 0: - lines.append("%s (already installed)\n" % (hdrlist.nevra(p))) - else: - lines.append("%s (%s installed)\n" % (hdrlist.nevra(p), hdrlist.nevra(f))) - else: - lines.append("%s\n" % (hdrlist.nevra(p))) + text = "%s" % hdrlist.nevra(p) + for f in ts.dbMatch('name', p.hdr[rpm.RPMTAG_NAME]): + if hdrlist.nevra(p) == hdrlist.nevra(f): + text = "%s (already installed)" % text + else: + text = "%s (%s installed)" % (text, hdrlist.nevra(f)) + lines.append("%s\n" % text) lines.sort() for line in lines: instLog.write(line)