2006-12-19 00:17:44 +01:00
|
|
|
Also test architecture in "refresh" test when not colored. This allows
|
2006-12-19 00:17:44 +01:00
|
|
|
updates to different architecture possible again.
|
2006-12-19 00:17:44 +01:00
|
|
|
|
2006-12-19 00:17:44 +01:00
|
|
|
--- ./lib/psm.c.orig 2005-12-14 18:59:10.000000000 +0000
|
|
|
|
+++ ./lib/psm.c 2006-02-24 11:46:54.000000000 +0000
|
|
|
|
@@ -1425,15 +1441,16 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s
|
2006-12-19 00:17:44 +01:00
|
|
|
|
2006-12-19 00:17:44 +01:00
|
|
|
assert(psm->mi == NULL);
|
|
|
|
psm->mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(psm->te), 0);
|
2006-12-19 00:17:44 +01:00
|
|
|
+ /* this must match rpmNameVersionCompare in depends.c */
|
2006-12-19 00:17:44 +01:00
|
|
|
xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
|
2006-12-19 00:17:44 +01:00
|
|
|
rpmteE(psm->te));
|
2006-12-19 00:17:44 +01:00
|
|
|
xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_VERSION, RPMMIRE_STRCMP,
|
2006-12-19 00:17:44 +01:00
|
|
|
rpmteV(psm->te));
|
2006-12-19 00:17:44 +01:00
|
|
|
xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_RELEASE, RPMMIRE_STRCMP,
|
2006-12-19 00:17:44 +01:00
|
|
|
rpmteR(psm->te));
|
2006-12-19 00:17:44 +01:00
|
|
|
- if (tscolor) {
|
|
|
|
- xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_ARCH, RPMMIRE_STRCMP,
|
|
|
|
+ xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_ARCH, RPMMIRE_STRCMP,
|
|
|
|
rpmteA(psm->te));
|
|
|
|
+ if (tscolor) {
|
|
|
|
xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_OS, RPMMIRE_STRCMP,
|
2006-12-19 00:17:44 +01:00
|
|
|
rpmteO(psm->te));
|
|
|
|
}
|