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

[jmr at macports.org]

Revision: 49738
          http://trac.macports.org/changeset/49738
Author:   jmr at macports.org
Date:     2009-04-16 21:05:44 -0700 (Thu, 16 Apr 2009)
Log Message:
-----------
upgrade proc: more concise handling of ports_nodeps

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2009-04-17 03:54:26 UTC (rev 49737)
+++ trunk/base/src/macports1.0/macports.tcl	2009-04-17 04:05:44 UTC (rev 49738)
@@ -2303,13 +2303,6 @@
         ui_debug "no version of $portname is active"
     }
 
-    # set the nodeps option  
-    if {![info exists options(ports_nodeps)]} {
-        set nodeps no
-    } else {
-        set nodeps yes
-    }
-
 	# save existing variant for later use
 	if {$anyactive} {
 	    set oldvariant $variant_active
@@ -2371,10 +2364,11 @@
 	set epoch_in_tree "$portinfo(epoch)"
 
 
-    if {$nodeps == "yes"} {
-        ui_debug "Not following dependencies"
-    } else {
+    # first upgrade dependencies
+    if {![info exists options(ports_nodeps)]} {
         _upgrade_dependencies portinfo depscache globalvarlist variationslist options
+    } else {
+        ui_debug "Not following dependencies"
     }
 
     # check installed version against version in ports
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090416/d42fa807/attachment-0001.html>