From 01beca5df717252c7c9aa59bc705dc10a25ebdc8 Mon Sep 17 00:00:00 2001 From: Andrew Gregory Date: Mon, 6 Oct 2014 16:45:10 -0400 Subject: 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 Signed-off-by: Allan McRae --- test/pacman/pmtest.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'test') 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)) -- cgit v1.2.3-24-g4f1b