summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorAndrew Gregory <andrew.gregory.8@gmail.com>2014-10-06 16:45:10 -0400
committerAllan McRae <allan@archlinux.org>2014-10-13 12:54:29 +1000
commit01beca5df717252c7c9aa59bc705dc10a25ebdc8 (patch)
treeef37062e577f2441cc04c66b7fa4f853d200c088 /test
parent7ddc967d7cf2b8de73095cb841ee2c5973a669e4 (diff)
downloadpacman-01beca5df717252c7c9aa59bc705dc10a25ebdc8.tar.xz
pacman: add --confirm option
--confirm cancels the effect of a previous --noconfirm. This makes it easier for scripts to default to --noconfirm but allow users to override it. Signed-off-by: Andrew Gregory <andrew.gregory.8@gmail.com> Signed-off-by: Allan McRae <allan@archlinux.org>
Diffstat (limited to 'test')
-rw-r--r--test/pacman/pmtest.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/pacman/pmtest.py b/test/pacman/pmtest.py
index 7ed30eb9..36829632 100644
--- a/test/pacman/pmtest.py
+++ b/test/pacman/pmtest.py
@@ -234,13 +234,13 @@ class pmtest(object):
"--log-file=%s" % os.path.join(self.root, "var/log/valgrind"),
"--suppressions=%s" % suppfile])
self.addrule("FILE_EMPTY=var/log/valgrind")
- cmd.extend([pacman["bin"],
+ cmd.extend([pacman["bin"], "--noconfirm",
"--config", os.path.join(self.root, util.PACCONF),
"--root", self.root,
"--dbpath", os.path.join(self.root, util.PM_DBPATH),
"--cachedir", os.path.join(self.root, util.PM_CACHEDIR)])
- if not pacman["manual-confirm"]:
- cmd.append("--noconfirm")
+ if pacman["manual-confirm"]:
+ cmd.append("--confirm")
if pacman["debug"]:
cmd.append("--debug=%s" % pacman["debug"])
cmd.extend(shlex.split(self.args))