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

[jmr at macports.org]

Revision: 68902
          http://trac.macports.org/changeset/68902
Author:   jmr at macports.org
Date:     2010-06-17 08:36:03 -0700 (Thu, 17 Jun 2010)
Log Message:
-----------
double check that old port is active before trying to deactivate due to replaced_by

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

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2010-06-17 15:25:58 UTC (rev 68901)
+++ trunk/base/src/macports1.0/macports.tcl	2010-06-17 15:36:03 UTC (rev 68902)
@@ -3223,7 +3223,8 @@
             set options(ports_force) yes
             if {$is_dryrun eq "yes"} {
                 ui_msg "Skipping deactivate $portname @${version_active}_${revision_active}${variant_active} (dry run)"
-            } elseif {!(${registry.format} == "receipt_sqlite" && [registry::run_target $regref deactivate [array get options]])
+            } elseif {![catch {registry::active $portname}] &&
+                      !(${registry.format} == "receipt_sqlite" && [registry::run_target $regref deactivate [array get options]])
                       && [catch {portimage::deactivate $portname ${version_active}_${revision_active}${variant_active} [array get options]} result]} {
                 global errorInfo
                 ui_debug "$errorInfo"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100617/d4f4eca2/attachment.html>