2006-12-19 00:17:44 +01:00
|
|
|
Also test architecture in "refresh" test when not colored. This allows
|
|
|
|
updates to different architecture possible again.
|
|
|
|
|
2008-09-12 20:37:28 +02:00
|
|
|
Index: lib/psm.c
|
|
|
|
===================================================================
|
|
|
|
--- lib/psm.c.orig
|
|
|
|
+++ lib/psm.c
|
|
|
|
@@ -1447,15 +1447,16 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s
|
2006-12-19 00:17:44 +01:00
|
|
|
|
|
|
|
assert(psm->mi == NULL);
|
|
|
|
psm->mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(psm->te), 0);
|
|
|
|
+ /* this must match rpmNameVersionCompare in depends.c */
|
|
|
|
xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
|
|
|
|
rpmteE(psm->te));
|
|
|
|
xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_VERSION, RPMMIRE_STRCMP,
|
|
|
|
rpmteV(psm->te));
|
|
|
|
xx = rpmdbSetIteratorRE(psm->mi, RPMTAG_RELEASE, RPMMIRE_STRCMP,
|
|
|
|
rpmteR(psm->te));
|
|
|
|
- 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,
|
|
|
|
rpmteO(psm->te));
|
|
|
|
}
|