[65651] trunk/base/src

[jmr at macports.org]

Revision: 65651
          http://trac.macports.org/changeset/65651
Author:   jmr at macports.org
Date:     2010-03-29 15:35:55 -0700 (Mon, 29 Mar 2010)
Log Message:
-----------
use registry::run_target in portuninstall

Modified Paths:
--------------
    trunk/base/src/port/port.tcl
    trunk/base/src/registry2.0/portuninstall.tcl

Modified: trunk/base/src/port/port.tcl
===================================================================
--- trunk/base/src/port/port.tcl	2010-03-29 22:14:50 UTC (rev 65650)
+++ trunk/base/src/port/port.tcl	2010-03-29 22:35:55 UTC (rev 65651)
@@ -2371,8 +2371,7 @@
             set i [lindex $ilist 0]
             set iactive [lindex $i 4]
             set regref [registry::entry open $portname [lindex $i 1] [lindex $i 2] [lindex $i 3] [lindex $i 5]]
-            if {(!$iactive || [registry::run_target $regref deactivate [array get options]])
-                && [registry::run_target $regref uninstall [array get options]]} {
+            if {[registry::run_target $regref uninstall [array get options]]} {
                 continue
             }
         }

Modified: trunk/base/src/registry2.0/portuninstall.tcl
===================================================================
--- trunk/base/src/registry2.0/portuninstall.tcl	2010-03-29 22:14:50 UTC (rev 65650)
+++ trunk/base/src/registry2.0/portuninstall.tcl	2010-03-29 22:35:55 UTC (rev 65651)
@@ -126,9 +126,11 @@
             foreach depport [$port dependents] {
                 # make sure it's still installed, since a previous dep uninstall may have removed it
                 if {[registry::entry exists $depport] && ([$depport state] == "imaged" || [$depport state] == "installed")} {
-                    set depname [$depport name]
-                    set depver "[$depport version]_[$depport revision][$depport variants]"
-                    registry_uninstall::uninstall $depname $depver [array get options]
+                    if {![registry::run_target $depport uninstall $optionslist]} {
+                        set depname [$depport name]
+                        set depver "[$depport version]_[$depport revision][$depport variants]"
+                        registry_uninstall::uninstall $depname $depver $optionslist
+                    }
                 }
             }
         } else {
@@ -140,7 +142,9 @@
             if {[info exists options(ports_dryrun)] && [string is true -strict $options(ports_dryrun)]} {
                 ui_msg "For $portname @${v}: skipping deactivate (dry run)"
             } else {
-                portimage::deactivate $portname $v $optionslist
+                if {![registry::run_target $port deactivate $optionslist]} {
+                    portimage::deactivate $portname $v $optionslist
+                }
             }
         }
     } else {
@@ -175,7 +179,7 @@
                     foreach depport $dl {
                         # make sure it's still installed, since a previous dep uninstall may have removed it
                         if {[registry::entry_exists_for_name $depport]} {
-                            registry_uninstall::uninstall $depport "" [array get options]
+                            registry_uninstall::uninstall $depport "" $optionslist
                         }
                     }
                 } else {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100329/649a6bff/attachment-0001.html>