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

[jmr at macports.org]

Revision: 50475
          http://trac.macports.org/changeset/50475
Author:   jmr at macports.org
Date:     2009-05-01 07:14:37 -0700 (Fri, 01 May 2009)
Log Message:
-----------
upgrade: simplify check for whether we have to uninstall an installed version

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-05-01 14:08:43 UTC (rev 50474)
+++ trunk/base/src/macports1.0/macports.tcl	2009-05-01 14:14:37 UTC (rev 50475)
@@ -2165,8 +2165,6 @@
         upvar $depscachename depscache
     }
 
-    # set to 1 if epoch overrides version
-    set epoch_override 0
     # Is this a dry run?
     set is_dryrun no
     if {[info exists options(ports_dryrun)] && $options(ports_dryrun) eq "yes"} {
@@ -2401,7 +2399,6 @@
             return 0
         } else {
             ui_debug "epoch override ... upgrading!"
-            set epoch_override 1
         }
     }
 
@@ -2440,8 +2437,7 @@
         }
     } else {
         # are we installing an existing version due to force or epoch override?
-        if {([info exists options(ports_force)] || $epoch_override == 1)
-            && [registry::entry_exists $portname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)]} {
+        if {[registry::entry_exists $portname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants)]} {
              ui_debug "Uninstalling $portname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants)"
             # we have to force the uninstall in case of dependents
             set force_cur [info exists options(ports_force)]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090501/79536f4a/attachment.html>