aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPer Øyvind Karlsen <peroyvind@mandriva.org>2012-08-03 19:58:50 +0000
committerPer Øyvind Karlsen <peroyvind@mandriva.org>2012-08-03 19:58:50 +0000
commit1324c69ea32e42bfa4a172bf5c819cefa78bef3f (patch)
treef0a69f471da2b3d0fc3b4073f9906f4b87c05051
parentff211b06781a086bdfec6b65ee482840ba71bdad (diff)
downloadperl-URPM-topic/4.37.tar
perl-URPM-topic/4.37.tar.gz
perl-URPM-topic/4.37.tar.bz2
perl-URPM-topic/4.37.tar.xz
perl-URPM-topic/4.37.zip
fix a regression where scriptlet requires weren't indicated as such in synthesis generatedtopic/4.37
-rw-r--r--NEWS2
-rw-r--r--URPM.xs4
2 files changed, 4 insertions, 2 deletions
diff --git a/NEWS b/NEWS
index ce85c1f..44d095f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,7 @@
Version 4.37.1 - 3 August 2012, by Per Øyvind Karlsen
+- fix a regression where scriptlet requires weren't indicated as such in
+ synthesis generated
- ~fix filesize computation
Version 4.37 - 24 July 2011, by Per Øyvind Karlsen
diff --git a/URPM.xs b/URPM.xs
index 2ffdd58..68bb48e 100644
--- a/URPM.xs
+++ b/URPM.xs
@@ -372,7 +372,7 @@ print_list_entry(char *buff, int sz, const char *name, rpmsenseFlags flags, cons
memcpy(p, name, len); p += len;
/* XXX: RPMSENSE_PREREQ obsolete, remove? */
- if (flags & (RPMSENSE_PREREQ|RPMSENSE_TRIGGER)) {
+ if (flags & (RPMSENSE_PREREQ|RPMSENSE_SCRIPT_PREUN|RPMSENSE_SCRIPT_PRE|RPMSENSE_SCRIPT_POSTUN|RPMSENSE_SCRIPT_POST)) {
if (p - buff + 3 >= sz) return -1;
memcpy(p, "[*]", 4); p += 3;
}
@@ -1117,7 +1117,7 @@ update_provides(URPM__Package pkg, HV *provides) {
flags = (rpmsenseFlags*)he->p.ui32p;
for (he->ix = 0; he->ix < count; he->ix++) {
len = strlen(list[he->ix]);
- update_provide_entry(list[he->ix], len, 1, flags && (flags[he->ix] & (RPMSENSE_PREREQ|RPMSENSE_TRIGGER)),
+ 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)),
pkg, provides);
}
flags = _free(flags);