[68903] branches/release_1_9/base/src/macports1.0/macports.tcl
jmr at macports.org
jmr at macports.org
Thu Jun 17 08:37:58 PDT 2010
Revision: 68903
http://trac.macports.org/changeset/68903
Author: jmr at macports.org
Date: 2010-06-17 08:37:57 -0700 (Thu, 17 Jun 2010)
Log Message:
-----------
merge r68902 from trunk:
double check that old port is active before trying to deactivate due to replaced_by
Revision Links:
--------------
http://trac.macports.org/changeset/68902
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-06-17 15:36:03 UTC (rev 68902)
+++ branches/release_1_9/base/src/macports1.0/macports.tcl 2010-06-17 15:37:57 UTC (rev 68903)
@@ -3203,7 +3203,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/0c754870/attachment.html>
More information about the macports-changes
mailing list