[64307] trunk/base/src/registry2.0/registry_util.tcl

[jmr at macports.org]

Revision: 64307
          http://trac.macports.org/changeset/64307
Author:   jmr at macports.org
Date:     2010-03-01 11:04:35 -0800 (Mon, 01 Mar 2010)
Log Message:
-----------
fix registry::check_dependents

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

Modified: trunk/base/src/registry2.0/registry_util.tcl
===================================================================
--- trunk/base/src/registry2.0/registry_util.tcl	2010-03-01 18:51:30 UTC (rev 64306)
+++ trunk/base/src/registry2.0/registry_util.tcl	2010-03-01 19:04:35 UTC (rev 64307)
@@ -61,17 +61,18 @@
 ## @param [in] port  a registry::entry to check
 ## @param [in] force if true, continue even if there are dependents
 proc check_dependents {port force} {
+    global UI_PREFIX
     # Check and make sure no ports depend on this one
     set deplist [$port dependents]
     if { [llength $deplist] > 0 } {
-        ui_msg "$UI_PREFIX [format [msgcat::mc "Unable to uninstall %s %s_%s%s, the following ports depend on it:"] $portname $version $revision $variants]"
+        ui_msg "$UI_PREFIX [format [msgcat::mc "Unable to uninstall/deactivate %s @%s_%s%s, the following ports depend on it:"] [$port name] [$port version] [$port revision] [$port variants]]"
         foreach depport $deplist {
-            ui_msg "$UI_PREFIX [format [msgcat::mc "	%s"] $depport]"
+            ui_msg "$UI_PREFIX [format [msgcat::mc "	%s @%s_%s%s"] [$depport name] [$depport version] [$depport revision] [$depport variants]]"
         }
-        if { [string is true $force] } {
-            ui_warn "Uninstall forced.  Proceeding despite dependencies."
+        if { [string is true -strict $force] } {
+            ui_warn "Uninstall/deactivate forced.  Proceeding despite dependencies."
         } else {
-            throw registry::uninstall-error "Please uninstall the ports that depend on $portname first."
+            throw registry::uninstall-error "Please uninstall the ports that depend on [$port name] first."
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20100301/c555d401/attachment.html>