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

[jmr at macports.org]

Revision: 106689
          https://trac.macports.org/changeset/106689
Author:   jmr at macports.org
Date:     2013-06-04 23:03:24 -0700 (Tue, 04 Jun 2013)
Log Message:
-----------
fix a case where upgrade's version comparison didn't quite match that of action_outdated

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2013-06-05 05:21:21 UTC (rev 106688)
+++ trunk/base/src/macports1.0/macports.tcl	2013-06-05 06:03:24 UTC (rev 106689)
@@ -3701,9 +3701,9 @@
             || ([vercmp $version_installed $version_in_tree] == 0
                 && [vercmp $revision_installed $revision_in_tree] >= 0 ))
         && ![info exists options(ports_upgrade_force)] } {
-        if {$portname != $newname} { 
+        if {$portname != $newname} {
             ui_debug "ignoring versions, installing replacement port"
-        } elseif { $epoch_installed < $epoch_in_tree } {
+        } elseif { $epoch_installed < $epoch_in_tree && $version_installed != $version_in_tree } {
             set build_override 1
             ui_debug "epoch override ... upgrading!"
         } elseif {[info exists options(ports_upgrade_enforce-variants)] && $options(ports_upgrade_enforce-variants) eq "yes"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130604/1d530f77/attachment.html>