aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2011-03-08 06:26:17 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2011-03-08 06:26:17 +0000
commita1952f3b53b8cc317d48dcca915c831c9a50dced (patch)
tree5d87cc9565d891af069aa80e3c2d6b18329b7e0a
parentdb06cd121f2efb95d678273031368101e08ae9b6 (diff)
downloadperl-URPM-a1952f3b53b8cc317d48dcca915c831c9a50dced.tar
perl-URPM-a1952f3b53b8cc317d48dcca915c831c9a50dced.tar.gz
perl-URPM-a1952f3b53b8cc317d48dcca915c831c9a50dced.tar.bz2
perl-URPM-a1952f3b53b8cc317d48dcca915c831c9a50dced.tar.xz
perl-URPM-a1952f3b53b8cc317d48dcca915c831c9a50dced.zip
pass RPMTAG_REQUIRENAME as argument to pretend_distepoch() as well
-rw-r--r--URPM.xs6
1 files changed, 3 insertions, 3 deletions
diff --git a/URPM.xs b/URPM.xs
index e2434ab..939f8d9 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -251,7 +251,7 @@ strip_distepoch(Header header, int32_t tag) {
}
static void
-pretend_distepoch(Header header, int32_t flags_tag, int32_t versions_tag) {
+pretend_distepoch(Header header, int32_t names_tag, int32_t flags_tag, int32_t versions_tag) {
struct rpmtd_s names, flags, versions;
char *EVR = headerFormat(header, "%|EPOCH?{%{EPOCH}:}|%{VERSION}-%{RELEASE}", NULL);
@@ -268,7 +268,7 @@ pretend_distepoch(Header header, int32_t flags_tag, int32_t versions_tag) {
for (flags.ix = 0; flags.ix < (int)flags.count; flags.ix++) {
if(!(flag[flags.ix] & ((RPMSENSE_LESS|RPMSENSE_GREATER|~RPMSENSE_EQUAL))) && version[flags.ix] && *version[flags.ix] && !strcmp(EVR, version[flags.ix])) {
if(!name) {
- headerGet(header, RPMTAG_REQUIRENAME, &names, HEADERGET_DEFAULT);
+ headerGet(header, names_tag, &names, HEADERGET_DEFAULT);
name = names.data;
name2 = malloc(++names.count * sizeof(*name));
@@ -3313,7 +3313,7 @@ Trans_add(trans, pkg, ...)
}
if(headerIsEntry(pkg->h, RPMTAG_DISTEPOCH)) {
- pretend_distepoch(pkg->h, RPMTAG_REQUIREFLAGS, RPMTAG_REQUIREVERSION);
+ pretend_distepoch(pkg->h, RPMTAG_REQUIRENAME, RPMTAG_REQUIREFLAGS, RPMTAG_REQUIREVERSION);
}
RETVAL = rpmtsAddInstallElement(trans->ts, pkg->h, (fnpyKey)(1+(long)(pkg->flag & FLAG_ID)), update, relocations) == 0;