aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2011-02-01 21:55:14 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2011-02-01 21:55:14 +0000
commit27bf5db0922ec99fb3088717928c2ac3e438c7ba (patch)
tree5a31dfbe0b69d8b477b1fcc89aa3cee8969ba8a0
parent18f3fae42ec6c7feaafc65bf222a2b020760646b (diff)
downloadperl-URPM-27bf5db0922ec99fb3088717928c2ac3e438c7ba.tar
perl-URPM-27bf5db0922ec99fb3088717928c2ac3e438c7ba.tar.gz
perl-URPM-27bf5db0922ec99fb3088717928c2ac3e438c7ba.tar.bz2
perl-URPM-27bf5db0922ec99fb3088717928c2ac3e438c7ba.tar.xz
perl-URPM-27bf5db0922ec99fb3088717928c2ac3e438c7ba.zip
strip distepoch from conflicts & obsoletes as well
-rw-r--r--URPM.xs3
1 files changed, 3 insertions, 0 deletions
diff --git a/URPM.xs b/URPM.xs
index 7d6e7c6..0a11f6f 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -3147,6 +3147,9 @@ Trans_add(trans, pkg, ...)
}
strip_distepoch(pkg->h, RPMTAG_PROVIDEVERSION);
strip_distepoch(pkg->h, RPMTAG_REQUIREVERSION);
+ strip_distepoch(pkg->h, RPMTAG_OBSOLETEVERSION);
+ strip_distepoch(pkg->h, RPMTAG_CONFLICTVERSION);
+
RETVAL = rpmtsAddInstallElement(trans->ts, pkg->h, (fnpyKey)(1+(long)(pkg->flag & FLAG_ID)), update, relocations) == 0;
/* free allocated memory, check rpm is copying it just above, at least in 4.0.4 */
#ifndef RPM_ORG