[projects/pld-builder.new] use ignores also when checking conflicts

glen glen at pld-linux.org
Fri May 8 21:32:22 CEST 2015


commit c6cbc56cdafd2fbba1e48f48a075ebf562767d7d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Fri May 8 22:32:20 2015 +0300

    use ignores also when checking conflicts

 PLD_Builder/install.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/PLD_Builder/install.py b/PLD_Builder/install.py
index 6104217..b7ab3f6 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" % br, user = "root")
+    f = chroot.popen("poldek --test --test --noask --caplookup -Q -v --upgrade %s %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
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/pld-builder.new.git/commitdiff/c6cbc56cdafd2fbba1e48f48a075ebf562767d7d



More information about the pld-cvs-commit mailing list