[123791] branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl

[shasha at macports.org]

Revision: 123791
          https://trac.macports.org/changeset/123791
Author:   shasha at macports.org
Date:     2014-08-14 09:07:33 -0700 (Thu, 14 Aug 2014)
Log Message:
-----------
minor fix

Modified Paths:
--------------
    branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl

Modified: branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl
===================================================================
--- branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl	2014-08-14 15:59:08 UTC (rev 123790)
+++ branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl	2014-08-14 16:07:33 UTC (rev 123791)
@@ -198,6 +198,7 @@
         throw registry::invalid "Registry error: ${portname}${composite_spec} not registered as installed"
     }
 
+    set userinput {}
     # uninstall dependents if requested
     if {[info exists options(ports_uninstall_follow-dependents)] && $options(ports_uninstall_follow-dependents) eq "yes"} {
         # don't uninstall dependents' dependencies
@@ -230,12 +231,14 @@
         if {[info exists options(ports_dryrun)] && [string is true -strict $options(ports_dryrun)]} {
             ui_msg "For $portname @${composite_spec}: skipping deactivate (dry run)"
         } else {
-            if {[info exists options(ports_uninstall_no-exec)] || ![registry::run_target $port deactivate $optionslist]} {
-                if {catch {$userinput eq "forcedbyuser"} result} {
-                    set options(ports_nodepcheck) "yes"
+            if {$userinput eq "forcedbyuser"} {
+                set options(ports_nodepcheck) "yes"
+            }
+            if {[info exists options(ports_uninstall_no-exec)] || ![registry::run_target $port deactivate [array get options]]} {
+                if {$userinput eq "forcedbyuser"} {
                     portimage::deactivate $portname $version $revision $variants [array get options]
                     unset options(ports_nodepcheck) 
-             } else {
+                } else {
                     portimage::deactivate $portname $version $revision $variants [array get options]
                 }
             }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140814/5fde5ee5/attachment.html>