From bcc78cbf50843f26ad1db074498982661698161e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Elan=20Ruusam=C3=A4e?= Date: Fri, 8 May 2015 23:01:12 +0300 Subject: [PATCH] avoid using ignores arg as package name --- PLD_Builder/install.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py index b7ab3f6..2606c13 100644 --- a/PLD_Builder/install.py +++ b/PLD_Builder/install.py @@ -161,7 +161,7 @@ def install_br(r, b): chroot.run("poldek --up --upa", user = "root", logfile = b.logfile) # check conflicts in BRed packages b.log_line("checking conflicting packages in BRed packages") - f = chroot.popen("poldek --test --test --noask --caplookup -Q -v --upgrade %s %s" % (b.ignores(), br), user = "root") + f = chroot.popen("poldek --test --test --noask --caplookup -Q -v %s --upgrade %s" % (b.ignores(), br), user = "root") # phonon-devel-4.3.1-1.i686 conflicts with qt4-phonon-devel-4.5.0-6.i686 # jdbc-stdext >= 2.0 is required by installed java-struts-1.3.10-1.noarch # jmx is needed by (installed) java-commons-modeler-2.0-1.noarch @@ -193,7 +193,7 @@ def install_br(r, b): b.log_line("installing BR: %s" % br) ignores = b.ignores() b.log_line("ignores: %s" % ignores) - res = chroot.run("set -x; poldek --noask --caplookup -Q -v --upgrade %s %s" % (ignores, br), + res = chroot.run("set -x; poldek --noask --caplookup -Q -v %s --upgrade %s" % (ignores, br), user = "root", logfile = b.logfile) if res != 0: -- 2.44.0