[36501] trunk/base/src

[raimue at macports.org]

Revision: 36501
          http://trac.macosforge.org/projects/macports/changeset/36501
Author:   raimue at macports.org
Date:     2008-05-04 11:18:13 -0700 (Sun, 04 May 2008)

Log Message:
-----------
base/src:
Addition to r36379, Adapting $portname @$version notation

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

Modified: trunk/base/src/registry1.0/portimage.tcl
===================================================================
--- trunk/base/src/registry1.0/portimage.tcl	2008-05-04 17:09:55 UTC (rev 36500)
+++ trunk/base/src/registry1.0/portimage.tcl	2008-05-04 18:18:13 UTC (rev 36501)
@@ -79,8 +79,12 @@
 		set force 0
 	}
 
-	ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s @%s"] $name $v]"
-	
+        if {$v != ""} {
+        	ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s @%s"] $name $v]"
+        } else {
+        	ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s"] $name]"
+        }
+
 	set ilist [_check_registry $name $v]
 	set version [lindex $ilist 1]
 	set revision [lindex $ilist 2]
@@ -142,8 +146,12 @@
 		set force 0
 	}
 
-	ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s @%s"] $name $v]"
-	
+        if {$v != ""} {
+        	ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s @%s"] $name $v]"
+        } else {
+        	ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s"] $name]"
+        }
+
 	set ilist [registry::active $name]
 	if { [llength $ilist] > 1 } {
 		return -code error "Registry error: Please specify the name of the port."

Modified: trunk/base/src/registry2.0/portimage.tcl
===================================================================
--- trunk/base/src/registry2.0/portimage.tcl	2008-05-04 17:09:55 UTC (rev 36500)
+++ trunk/base/src/registry2.0/portimage.tcl	2008-05-04 18:18:13 UTC (rev 36501)
@@ -77,7 +77,11 @@
         set force 0
     }
 
-    ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s @%s"] $name $specifier]"
+    if {$specifier != ""} {
+            ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s @%s"] $name $specifier]"
+    } else {
+            ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s"] $name]"
+    }
 
     registry::read {
 
@@ -131,7 +135,11 @@
         set force 0
     }
 
-    ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s @%s"] $name $v]"
+    if {$spec != ""} {
+            ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s @%s"] $name $spec]"
+    } else {
+            ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s"] $name]"
+    }
 
     if { [string equal $name {}] } {
         throw registry::image-error "Registry error: Please specify the name of the port."

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20080504/c53b79de/attachment-0001.html