summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2011-05-25 14:03:57 +0300
committerPanu Matilainen <pmatilai@redhat.com>2011-05-25 14:04:18 +0300
commit099f09de45cb7c241980da4e8cde7de61f5c1936 (patch)
tree17a30ad72d49d99cddf315d0274f903112f717f6
parentd885361c84525c5af468204f936993763cca0e6b (diff)
downloadrpm-099f09de45cb7c241980da4e8cde7de61f5c1936.tar.gz
rpm-099f09de45cb7c241980da4e8cde7de61f5c1936.tar.bz2
rpm-099f09de45cb7c241980da4e8cde7de61f5c1936.zip
Don't run collections on script stages like %pre/posttrans, ugh.
-rw-r--r--lib/rpmte.c10
1 files changed, 7 insertions, 3 deletions
diff --git a/lib/rpmte.c b/lib/rpmte.c
index dfd7b6f45..d13575ac1 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -904,15 +904,19 @@ int rpmteProcess(rpmte te, pkgGoal goal)
}
}
- rpmteRunAllCollections(te, PLUGINHOOK_COLL_PRE_REMOVE);
+ if (!scriptstage) {
+ rpmteRunAllCollections(te, PLUGINHOOK_COLL_PRE_REMOVE);
+ }
if (rpmteOpen(te, reset_fi)) {
failed = rpmpsmRun(te->ts, te, goal);
rpmteClose(te, reset_fi);
}
- rpmteRunAllCollections(te, PLUGINHOOK_COLL_POST_ADD);
- rpmteRunAllCollections(te, PLUGINHOOK_COLL_POST_ANY);
+ if (!scriptstage) {
+ rpmteRunAllCollections(te, PLUGINHOOK_COLL_POST_ADD);
+ rpmteRunAllCollections(te, PLUGINHOOK_COLL_POST_ANY);
+ }
/* XXX should %pretrans failure fail the package install? */
if (failed && !scriptstage) {