[69437] branches/release_1_9/base/src/macports1.0/macports.tcl

[jmr at macports.org]

Revision: 69437
          http://trac.macports.org/changeset/69437
Author:   jmr at macports.org
Date:     2010-07-06 00:35:39 -0700 (Tue, 06 Jul 2010)
Log Message:
-----------
merge r69436 from trunk:
 get correct epoch of existing version when uninstalling due to epoch override in upgrade (#25543)

Revision Links:
--------------
    http://trac.macports.org/changeset/69436

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

Modified: branches/release_1_9/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_1_9/base/src/macports1.0/macports.tcl	2010-07-06 07:25:46 UTC (rev 69436)
+++ branches/release_1_9/base/src/macports1.0/macports.tcl	2010-07-06 07:35:39 UTC (rev 69437)
@@ -3177,7 +3177,8 @@
             # we have to force the uninstall in case of dependents
             set force_cur [info exists options(ports_force)]
             set options(ports_force) yes
-            set newregref [registry::open_entry $newname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants) $epoch_in_tree]
+            set existing_epoch [lindex [lindex [registry::installed $newname ${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants)] 0] 5]
+            set newregref [registry::open_entry $newname $version_in_tree $revision_in_tree $portinfo(canonical_active_variants) $existing_epoch]
             if {$is_dryrun eq "yes"} {
                 ui_msg "Skipping uninstall $newname @${version_in_tree}_${revision_in_tree}$portinfo(canonical_active_variants) (dry run)"
             } elseif {!(${registry.format} == "receipt_sqlite" && [registry::run_target $newregref uninstall [array get options]])
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100706/7a7a25bd/attachment.html>