Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDan McGee <dan@archlinux.org>2011-05-16 11:52:49 -0500
committerDan McGee <dan@archlinux.org>2011-05-16 11:52:49 -0500
commitba467779bb0faa6ea81d91759c2224592091bbe3 (patch)
treeb6d29ebbb0fa8b9fb690b8813d99a27092373693
parentaec60e37822509a1ca7fc53244878d3f1505d964 (diff)
Ensure --print doesn't enable --noconfirm when not expected
This is at best a hack around the way we currently do our --print magic, but at least prevents someone from shooting themselves in the foot as indicated in FS#24287. Signed-off-by: Dan McGee <dan@archlinux.org>
-rw-r--r--src/pacman/pacman.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/pacman/pacman.c b/src/pacman/pacman.c
index 0ad03540..8bdb216e 100644
--- a/src/pacman/pacman.c
+++ b/src/pacman/pacman.c
@@ -1416,7 +1416,7 @@ int main(int argc, char *argv[])
}
/* set up the print operations */
- if(config->print) {
+ if(config->print && !config->op_s_clean) {
config->noconfirm = 1;
config->flags |= PM_TRANS_FLAG_NOCONFLICTS;
config->flags |= PM_TRANS_FLAG_NOLOCK;