aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2010-12-03 21:07:42 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2010-12-03 21:07:42 +0000
commit5627fc47a5ba19725d70bb04f7bd05cb9f96294a (patch)
tree3350574f96f8692d663fea83abd1c2144f6e2c36
parent3250ba1805605ea2fdd15ff577f7995f46ccec6d (diff)
downloadperl-URPM-5627fc47a5ba19725d70bb04f7bd05cb9f96294a.tar
perl-URPM-5627fc47a5ba19725d70bb04f7bd05cb9f96294a.tar.gz
perl-URPM-5627fc47a5ba19725d70bb04f7bd05cb9f96294a.tar.bz2
perl-URPM-5627fc47a5ba19725d70bb04f7bd05cb9f96294a.tar.xz
perl-URPM-5627fc47a5ba19725d70bb04f7bd05cb9f96294a.zip
use RPMSENSE_TRIGGER
-rw-r--r--URPM.xs5
1 files changed, 3 insertions, 2 deletions
diff --git a/URPM.xs b/URPM.xs
index 0e47578..c926596 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -327,7 +327,8 @@ print_list_entry(char *buff, int sz, const char *name, rpmsenseFlags flags, cons
if (len >= sz || !strncmp(name, "rpmlib(", 7)) return -1;
memcpy(p, name, len); p += len;
- if (flags & (RPMSENSE_PREREQ|RPMSENSE_SCRIPT_PREUN|RPMSENSE_SCRIPT_PRE|RPMSENSE_SCRIPT_POSTUN|RPMSENSE_SCRIPT_POST)) {
+ /* XXX: RPMSENSE_PREREQ obsolete, remove? */
+ if (flags & (RPMSENSE_PREREQ|RPMSENSE_TRIGGER)) {
if (p - buff + 3 >= sz) return -1;
memcpy(p, "[*]", 4); p += 3;
}
@@ -1045,7 +1046,7 @@ update_provides(URPM__Package pkg, HV *provides) {
for (he->ix = 0; he->ix < (int)he->c; he->ix++) {
len = strlen(list[he->ix]);
if (strncmp(list[he->ix], "rpmlib(", 7)) continue;
- update_provide_entry(list[he->ix], len, 1, flags && flags[he->ix] & (RPMSENSE_PREREQ|RPMSENSE_SCRIPT_PREUN|RPMSENSE_SCRIPT_PRE|RPMSENSE_SCRIPT_POSTUN|RPMSENSE_SCRIPT_POST|RPMSENSE_LESS|RPMSENSE_EQUAL|RPMSENSE_GREATER),
+ update_provide_entry(list[he->ix], len, 1, flags && flags[he->ix] & (RPMSENSE_PREREQ|RPMSENSE_TRIGGER),
pkg, provides);
}
flags = _free(flags);