Changeset 99279

Timestamp:

Oct 31, 2012, 12:51:14 AM (12 years ago)

Author:

jmr@…

Message:

honour license_noconflict in dependencies as well as the top-level port

File:

• trunk/base/portmgr/jobs/port_binary_distributable.tcl (modified) (1 diff)

trunk/base/portmgr/jobs/port_binary_distributable.tcl

@@ -256 +256 @@
         }
 
+        # skip deps that are explicitly stated to not conflict
+        array unset aPort_noconflict_ports
+        foreach noconflict_port [lindex $aPortInfo 3] {
+            set aPort_noconflict_ports($noconflict_port) 1
+        }
         # add its deps to the list
         foreach possiblyNewPort [lindex $aPortInfo 0] {
-            if {![info exists portSeen($possiblyNewPort)]} {
+            if {![info exists portSeen($possiblyNewPort)] && ![info exists aPort_noconflict_ports($possiblyNewPort)]} {
                 lappend portList $possiblyNewPort
             }