[99279] trunk/base/portmgr/jobs/port_binary_distributable.tcl

[jmr at macports.org]

Revision: 99279
          http://trac.macports.org//changeset/99279
Author:   jmr at macports.org
Date:     2012-10-30 17:51:14 -0700 (Tue, 30 Oct 2012)
Log Message:
-----------
honour license_noconflict in dependencies as well as the top-level port

Modified Paths:
--------------
    trunk/base/portmgr/jobs/port_binary_distributable.tcl

Modified: trunk/base/portmgr/jobs/port_binary_distributable.tcl
===================================================================
--- trunk/base/portmgr/jobs/port_binary_distributable.tcl	2012-10-31 00:38:21 UTC (rev 99278)
+++ trunk/base/portmgr/jobs/port_binary_distributable.tcl	2012-10-31 00:51:14 UTC (rev 99279)
@@ -255,9 +255,14 @@
             }
         }
 
+        # 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
             }
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121030/4d8275c8/attachment.html>