summaryrefslogtreecommitdiff
path: root/lib/rpmte.c
diff options
context:
space:
mode:
authorPanu Matilainen <pmatilai@redhat.com>2011-11-22 12:34:46 +0200
committerPanu Matilainen <pmatilai@redhat.com>2011-11-22 12:34:46 +0200
commit0761bad2697d3baadac9854be6838fbb603971c0 (patch)
tree5de7c239c2f58a3f84fabbe7dbe2a9db933c12f9 /lib/rpmte.c
parent71c6b06b3f240021f2ece46f9cf7aa891f716710 (diff)
downloadlibrpm-tizen-0761bad2697d3baadac9854be6838fbb603971c0.tar.gz
librpm-tizen-0761bad2697d3baadac9854be6838fbb603971c0.tar.bz2
librpm-tizen-0761bad2697d3baadac9854be6838fbb603971c0.zip
Ehm, %pretrans failure shouldn't abort the entire transaction
- Brainfart in previous commit (71c6b06b3f240021f2ece46f9cf7aa891f716710): %pretrans failure should only cause that package to fail, not abort the entire transaction. Doh. - Failures are tracked via transaction elements but pre/posttrans were specifically filtered out. All we need is removing that filtering and the warn-only vs error logic in psm takes care of the rest. The transaction.c changes in previous commit were just unnecessary.
Diffstat (limited to 'lib/rpmte.c')
-rw-r--r--lib/rpmte.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/rpmte.c b/lib/rpmte.c
index acc985f81..ac1f1a46e 100644
--- a/lib/rpmte.c
+++ b/lib/rpmte.c
@@ -921,8 +921,7 @@ int rpmteProcess(rpmte te, pkgGoal goal)
rpmteRunAllCollections(te, PLUGINHOOK_COLL_POST_ANY);
}
- /* XXX should %pretrans failure fail the package install? */
- if (failed && !scriptstage) {
+ if (failed) {
failed = rpmteMarkFailed(te);
}