a76d6c30a2
Copy from Base:System/rpm based on submit request 18841 from user mlschroe OBS-URL: https://build.opensuse.org/request/show/18841 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=84
28 lines
1.0 KiB
Diff
28 lines
1.0 KiB
Diff
Also test architecture in "refresh" test when not colored. This allows
|
|
updates to different architecture possible again.
|
|
|
|
Index: lib/psm.c
|
|
===================================================================
|
|
--- lib/psm.c.orig
|
|
+++ lib/psm.c
|
|
@@ -1202,6 +1202,7 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s
|
|
|
|
psm->scriptArg = psm->npkgs_installed + 1;
|
|
|
|
+ /* this must match rpmNameVersionCompare in depends.c */
|
|
mi = rpmtsInitIterator(ts, RPMTAG_NAME, rpmteN(psm->te), 0);
|
|
xx = rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP,
|
|
rpmteE(psm->te));
|
|
@@ -1209,9 +1210,9 @@ rpmRC rpmpsmStage(rpmpsm psm, pkgStage s
|
|
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));
|
|
}
|