[64653] trunk/base/src/port/port.tcl

[jmr at macports.org]

Revision: 64653
          http://trac.macports.org/changeset/64653
Author:   jmr at macports.org
Date:     2010-03-12 19:39:14 -0800 (Fri, 12 Mar 2010)
Log Message:
-----------
explicitly run deactivate target in action_uninstall when needed so as to run pre/post code

Modified Paths:
--------------
    trunk/base/src/port/port.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2010-03-13 02:54:10 UTC (rev 64652)
+++ trunk/base/src/port/port.tcl	2010-03-13 03:39:14 UTC (rev 64653)
@@ -2299,8 +2299,10 @@
             set iversion [lindex $i 1]
             set irevision [lindex $i 2]
             set ivariants [lindex $i 3]
+            set iactive [lindex $i 4]
             if {![catch {set mport [mportopen_installed $portname $iversion $irevision $ivariants [array get options]]}]} {
-                if {[catch {set result [mportexec $mport uninstall]} result]} {
+                if {($iactive && [catch {set result [mportexec $mport deactivate]} result])
+                    || [catch {set result [mportexec $mport uninstall]} result]} {
                     global errorInfo
                     mportclose_installed $mport
                     ui_debug "$errorInfo"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100312/dcb823d3/attachment.html>