Changeset 15647 for trunk/base

Timestamp:

Dec 30, 2005, 4:03:51 PM (18 years ago)

Author:

olegb

Message:

Bug: 6220
Submitted by: dluke@
Reviewed by: olegb@
Approved by: olegb@
Obtained from:

dluke's optimization of the upgrade code.

File:

• trunk/base/src/darwinports1.0/darwinports.tcl (modified) (5 diffs)

trunk/base/src/darwinports1.0/darwinports.tcl

@@ -1 +1 @@
 # darwinports.tcl
-# $Id: darwinports.tcl,v 1.200 2005/12/14 05:10:19 jberry Exp $
+# $Id: darwinports.tcl,v 1.201 2005/12/30 16:03:51 olegb Exp $
 #
 # Copyright (c) 2002 Apple Computer, Inc.
@@ -1433 +1433 @@
 
 # upgrade procedure
-proc darwinports::upgrade {pname dspec variationslist optionslist} {
+proc darwinports::upgrade {pname dspec variationslist optionslist {depscachename ""}} {
         array set options $optionslist
         array set variations $variationslist
+        if {![string match "" $depscachename]} {
+                upvar $depscachename depscache
+        } 
 
         # set to no-zero is epoch overrides version
@@ -1572 +1575 @@
                 if {[info exists portinfo(depends_build)]} {
                         foreach i $portinfo(depends_build) {
+                                if {![llength [array get depscache $i]]} {
                                 set d [lindex [split $i :] end]
-                                upgrade $d $i $variationslist $optionslist
+                                        set depscache($i) 1
+                                        upgrade $d $i $variationslist $optionslist depscache
+                                } 
                         }
                 }
@@ -1579 +1585 @@
                 if {[info exists portinfo(depends_lib)]} {
                         foreach i $portinfo(depends_lib) {
+                                if {![llength [array get depscache $i]]} {
                                 set d [lindex [split $i :] end]
-                                upgrade $d $i $variationslist $optionslist
+                                        set depscache($i) 1
+                                        upgrade $d $i $variationslist $optionslist depscache
+                                } 
                         }
                 }
@@ -1586 +1595 @@
                 if {[info exists portinfo(depends_run)]} {
                         foreach i $portinfo(depends_run) {
+                                if {![llength [array get depscache $i]]} {
                                 set d [lindex [split $i :] end]
-                                upgrade $d $i $variationslist $optionslist
+                                        set depscache($i) 1
+                                        upgrade $d $i $variationslist $optionslist depscache
+                                } 
                         }
                 }