Michael Schröder
cebe6dd1a8
OBS-URL: https://build.opensuse.org/package/show/Base:System/rpm?expand=0&rev=93
26 lines
997 B
Diff
26 lines
997 B
Diff
Also test architecture in "refresh" test when not colored. This allows
|
|
updates to different architectures.
|
|
|
|
--- ./lib/psm.c.orig 2010-12-21 09:50:23.000000000 +0000
|
|
+++ ./lib/psm.c 2011-05-11 12:47:13.000000000 +0000
|
|
@@ -723,6 +723,7 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg
|
|
|
|
psm->scriptArg = psm->npkgs_installed + 1;
|
|
|
|
+ /* this must match rpmNameVersionCompare in depends.c */
|
|
mi = rpmtsInitIterator(ts, RPMDBI_NAME, rpmteN(psm->te), 0);
|
|
xx = rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
|
|
rpmteE(psm->te));
|
|
@@ -730,9 +731,9 @@ static rpmRC rpmpsmStage(rpmpsm psm, pkg
|
|
rpmteV(psm->te));
|
|
xx = rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP,
|
|
rpmteR(psm->te));
|
|
+ xx = rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_STRCMP,
|
|
+ rpmteA(psm->te));
|
|
if (tscolor) {
|
|
- xx = rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_STRCMP,
|
|
- rpmteA(psm->te));
|
|
xx = rpmdbSetIteratorRE(mi, RPMTAG_OS, RPMMIRE_STRCMP,
|
|
rpmteO(psm->te));
|
|
}
|