Don't include Arch in release for backwards compat (#135008)
authorpauln <devnull@localhost>
Mon, 11 Oct 2004 15:16:49 +0000 (15:16 +0000)
committerpauln <devnull@localhost>
Mon, 11 Oct 2004 15:16:49 +0000 (15:16 +0000)
CVS patchset: 7447
CVS date: 2004/10/11 15:16:49

python/rpmts-py.c

index a1b950a..8e5d741 100644 (file)
@@ -412,7 +412,7 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
                                   conflicts[i].suggestedPkgs[0] : Py_None,
                               conflicts[i].sense);
 #else
-           char * byName, * byVersion, * byRelease;
+           char * byName, * byVersion, * byRelease, *byArch;
            char * needsName, * needsOP, * needsVersion;
            int needsFlags, sense;
            fnpyKey key;
@@ -420,6 +420,8 @@ fprintf(stderr, "*** rpmts_Check(%p) ts %p cb %p\n", s, s->ts, cbInfo.cb);
            p = ps->probs + i;
 
            byName = p->pkgNEVR;
+           if ((byArch= strrchr(byName, '.')) != NULL)
+               *byArch++ = '\0';
            if ((byRelease = strrchr(byName, '-')) != NULL)
                *byRelease++ = '\0';
            if ((byVersion = strrchr(byName, '-')) != NULL)