[115682] trunk/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 115682
          https://trac.macports.org/changeset/115682
Author:   jmr at macports.org
Date:     2014-01-08 13:39:08 -0800 (Wed, 08 Jan 2014)
Log Message:
-----------
skip opening ports with negative installs_libs when the port is already present

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2014-01-08 20:27:44 UTC (rev 115681)
+++ trunk/base/src/macports1.0/macports.tcl	2014-01-08 21:39:08 UTC (rev 115682)
@@ -3125,17 +3125,23 @@
                     return 1
                 } elseif {[info exists dep_portinfo(installs_libs)] && !$dep_portinfo(installs_libs)} {
                     set check_archs 0
+                    if {$skipSatisfied && $present} {
+                        set parse 0
+                    }
                 }
-                set dep_options $options
-                lappend dep_options subport $dep_portinfo(name)
-                # Figure out the depport. Check the open_mports list first, since
-                # we potentially leak mport references if we mportopen each time,
-                # because mportexec only closes each open mport once.
-                set depport [dlist_match_multi $macports::open_mports [list porturl $dep_portinfo(porturl) options $dep_options]]
 
-                if {$depport eq {}} {
-                    # We haven't opened this one yet.
-                    set depport [mportopen $dep_portinfo(porturl) $dep_options $variations]
+                if {$parse} {
+                    set dep_options $options
+                    lappend dep_options subport $dep_portinfo(name)
+                    # Figure out the depport. Check the open_mports list first, since
+                    # we potentially leak mport references if we mportopen each time,
+                    # because mportexec only closes each open mport once.
+                    set depport [dlist_match_multi $macports::open_mports [list porturl $dep_portinfo(porturl) options $dep_options]]
+
+                    if {$depport eq {}} {
+                        # We haven't opened this one yet.
+                        set depport [mportopen $dep_portinfo(porturl) $dep_options $variations]
+                    }
                 }
             }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140108/a83e8351/attachment.html>