|
Bernhard M. Wiedemann |
1250f9 |
Also test architecture in "refresh" test when not colored. This allows
|
|
Bernhard M. Wiedemann |
1250f9 |
updates to different architectures.
|
|
Bernhard M. Wiedemann |
1250f9 |
|
|
Bernhard M. Wiedemann |
1250f9 |
--- ./lib/psm.c.orig 2012-03-20 08:07:25.000000000 +0000
|
|
Bernhard M. Wiedemann |
1250f9 |
+++ ./lib/psm.c 2012-06-01 10:22:24.000000000 +0000
|
|
Bernhard M. Wiedemann |
1250f9 |
@@ -680,13 +680,14 @@ void rpmpsmNotify(rpmpsm psm, int what,
|
|
Bernhard M. Wiedemann |
1250f9 |
*/
|
|
Bernhard M. Wiedemann |
1250f9 |
static void markReplacedInstance(rpmts ts, rpmte te)
|
|
Bernhard M. Wiedemann |
1250f9 |
{
|
|
Bernhard M. Wiedemann |
1250f9 |
+ /* this must match rpmNameVersionCompare in depends.c */
|
|
Bernhard M. Wiedemann |
1250f9 |
rpmdbMatchIterator mi = rpmtsInitIterator(ts, RPMDBI_NAME, rpmteN(te), 0);
|
|
Bernhard M. Wiedemann |
1250f9 |
rpmdbSetIteratorRE(mi, RPMTAG_EPOCH, RPMMIRE_STRCMP, rpmteE(te));
|
|
Bernhard M. Wiedemann |
1250f9 |
rpmdbSetIteratorRE(mi, RPMTAG_VERSION, RPMMIRE_STRCMP, rpmteV(te));
|
|
Bernhard M. Wiedemann |
1250f9 |
rpmdbSetIteratorRE(mi, RPMTAG_RELEASE, RPMMIRE_STRCMP, rpmteR(te));
|
|
Bernhard M. Wiedemann |
1250f9 |
+ rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_STRCMP, rpmteA(te));
|
|
Bernhard M. Wiedemann |
1250f9 |
/* XXX shouldn't we also do this on colorless transactions? */
|
|
Bernhard M. Wiedemann |
1250f9 |
if (rpmtsColor(ts)) {
|
|
Bernhard M. Wiedemann |
1250f9 |
- rpmdbSetIteratorRE(mi, RPMTAG_ARCH, RPMMIRE_STRCMP, rpmteA(te));
|
|
Bernhard M. Wiedemann |
1250f9 |
rpmdbSetIteratorRE(mi, RPMTAG_OS, RPMMIRE_STRCMP, rpmteO(te));
|
|
Bernhard M. Wiedemann |
1250f9 |
}
|
|
Bernhard M. Wiedemann |
1250f9 |
|