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

shasha at macports.org shasha at macports.org
Wed Aug 13 17:09:41 PDT 2014


Revision: 123760
          https://trac.macports.org/changeset/123760
Author:   shasha at macports.org
Date:     2014-08-13 17:09:40 -0700 (Wed, 13 Aug 2014)
Log Message:
-----------
added check for avoiding running of check_dependents in deactivate

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 00:07:15 UTC (rev 123759)
+++ branches/gsoc14-interactive/base/src/registry2.0/portuninstall.tcl	2014-08-14 00:09:40 UTC (rev 123760)
@@ -220,7 +220,10 @@
         }
     } else {
         # check its dependents
-        registry::check_dependents $port ${uninstall.force} "uninstall"
+        set userinput [registry::check_dependents $port ${uninstall.force} "uninstall"]
+        if {$userinput eq "quit"} {
+            return 0
+        }
     }
     # if it's active, deactivate it
     if {[$port state] eq "installed"} {
@@ -228,7 +231,13 @@
             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]} {
-                portimage::deactivate $portname $version $revision $variants [array get options]
+                if {catch {$userinput eq "forcedbyuser"} result} {
+                    set options(ports_nodepcheck) "yes"
+                    portimage::deactivate $portname $version $revision $variants [array get options]
+                    unset options(ports_nodepcheck) 
+             } 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/20140813/24847362/attachment-0001.html>


More information about the macports-changes mailing list