[123759] branches/gsoc14-interactive/base/src/registry2.0/portimage.tcl

[shasha at macports.org]

Revision: 123759
          https://trac.macports.org/changeset/123759
Author:   shasha at macports.org
Date:     2014-08-13 17:07:15 -0700 (Wed, 13 Aug 2014)
Log Message:
-----------
implemented interactivity for deactivating a port having dependents

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

Modified: branches/gsoc14-interactive/base/src/registry2.0/portimage.tcl
===================================================================
--- branches/gsoc14-interactive/base/src/registry2.0/portimage.tcl	2014-08-13 23:45:45 UTC (rev 123758)
+++ branches/gsoc14-interactive/base/src/registry2.0/portimage.tcl	2014-08-14 00:07:15 UTC (rev 123759)
@@ -185,8 +185,6 @@
         return -code error "Active version of $name is not $v but ${specifier}."
     }
 
-    ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s @%s"] $name $specifier]"
-
     if { [$requested installtype] ne "image" } {
         return -code error "Image error: ${name} @${specifier} not installed as an image."
     }
@@ -194,11 +192,16 @@
     if { [$requested state] ne "installed" } {
         return -code error "Image error: ${name} @${specifier} is not active."
     }
-
+	
     if {![info exists options(ports_nodepcheck)] || ![string is true -strict $options(ports_nodepcheck)]} {
-        registry::check_dependents $requested $force "deactivate"
+        set retvalue [registry::check_dependents $requested $force "deactivate"]
+        if {$retvalue eq "quit"} {
+            return
+        }
     }
 
+    ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s @%s"] $name $specifier]"
+	
     _deactivate_contents $requested [$requested files] $force
 }
 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140813/bd778a1e/attachment.html>