[36379] trunk/base/src

[raimue at macports.org]

Revision: 36379
          http://trac.macosforge.org/projects/macports/changeset/36379
Author:   raimue at macports.org
Date:     2008-04-28 20:29:37 -0700 (Mon, 28 Apr 2008)

Log Message:
-----------
base/src:
Adapting $portname @$version notation

Modified Paths:
--------------
    trunk/base/src/macports1.0/macports.tcl
    trunk/base/src/port1.0/portinstall.tcl
    trunk/base/src/registry1.0/portimage.tcl
    trunk/base/src/registry1.0/portuninstall.tcl
    trunk/base/src/registry2.0/portimage.tcl
    trunk/base/src/registry2.0/portuninstall.tcl

Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl	2008-04-29 03:18:38 UTC (rev 36378)
+++ trunk/base/src/macports1.0/macports.tcl	2008-04-29 03:29:37 UTC (rev 36379)
@@ -1966,7 +1966,7 @@
                     if {[catch {portimage::deactivate $portname $version $optionslist} result]} {
                         global errorInfo
                         ui_debug "$errorInfo"
-                        ui_error "Deactivating $portname $version_installed_$revision_installed failed: $result"
+                        ui_error "Deactivating $portname @${version_installed}_${revision_installed} failed: $result"
                         return 1
                     }
                 }
@@ -1974,10 +1974,10 @@
         }
         if { [lindex $num 4] == 0 && 0 == [string compare "image" ${macports::registry.installtype}] } {
             # activate the latest installed version
-            if {[catch {portimage::activate $portname ${version_installed}_$revision_installed$variant $optionslist} result]} {
+            if {[catch {portimage::activate $portname ${version_installed}_${revision_installed}$variant $optionslist} result]} {
                 global errorInfo
                 ui_debug "$errorInfo"
-                ui_error "Activating $portname ${version_installed}_$revision_installed failed: $result"
+                ui_error "Activating $portname @${version_installed}_${revision_installed} failed: $result"
                 return 1
             }
         }

Modified: trunk/base/src/port1.0/portinstall.tcl
===================================================================
--- trunk/base/src/port1.0/portinstall.tcl	2008-04-29 03:18:38 UTC (rev 36378)
+++ trunk/base/src/port1.0/portinstall.tcl	2008-04-29 03:29:37 UTC (rev 36379)
@@ -48,7 +48,7 @@
 
 proc install_start {args} {
 	global UI_PREFIX portname portversion portrevision variations portvariants
-	ui_msg "$UI_PREFIX [format [msgcat::mc "Installing %s %s_%s%s"] $portname $portversion $portrevision $portvariants]"
+	ui_msg "$UI_PREFIX [format [msgcat::mc "Installing %s @%s_%s%s"] $portname $portversion $portrevision $portvariants]"
 }
 
 proc install_element {src_element dst_element} {

Modified: trunk/base/src/registry1.0/portimage.tcl
===================================================================
--- trunk/base/src/registry1.0/portimage.tcl	2008-04-29 03:18:38 UTC (rev 36378)
+++ trunk/base/src/registry1.0/portimage.tcl	2008-04-29 03:29:37 UTC (rev 36379)
@@ -79,7 +79,7 @@
 		set force 0
 	}
 
-	ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s %s"] $name $v]"
+	ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s @%s"] $name $v]"
 	
 	set ilist [_check_registry $name $v]
 	set version [lindex $ilist 1]
@@ -142,7 +142,7 @@
 		set force 0
 	}
 
-	ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s %s"] $name $v]"
+	ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s @%s"] $name $v]"
 	
 	set ilist [registry::active $name]
 	if { [llength $ilist] > 1 } {

Modified: trunk/base/src/registry1.0/portuninstall.tcl
===================================================================
--- trunk/base/src/registry1.0/portuninstall.tcl	2008-04-29 03:18:38 UTC (rev 36378)
+++ trunk/base/src/registry1.0/portuninstall.tcl	2008-04-29 03:29:37 UTC (rev 36379)
@@ -128,7 +128,7 @@
 		portimage::deactivate $portname ${version}_${revision}${variants} $optionslist
 	}
 
-	ui_msg "$UI_PREFIX [format [msgcat::mc "Uninstalling %s %s_%s%s"] $portname $version $revision $variants]"
+	ui_msg "$UI_PREFIX [format [msgcat::mc "Uninstalling %s @%s_%s%s"] $portname $version $revision $variants]"
 
 	# Look to see if the port has registered an uninstall procedure
 	set uninstall [registry::property_retrieve $ref pkg_uninstall] 

Modified: trunk/base/src/registry2.0/portimage.tcl
===================================================================
--- trunk/base/src/registry2.0/portimage.tcl	2008-04-29 03:18:38 UTC (rev 36378)
+++ trunk/base/src/registry2.0/portimage.tcl	2008-04-29 03:29:37 UTC (rev 36379)
@@ -77,7 +77,7 @@
         set force 0
     }
 
-    ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s %s"] $name $specifier]"
+    ui_msg "$UI_PREFIX [format [msgcat::mc "Activating %s @%s"] $name $specifier]"
 
     registry::read {
 
@@ -131,7 +131,7 @@
         set force 0
     }
 
-    ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s %s"] $name $v]"
+    ui_msg "$UI_PREFIX [format [msgcat::mc "Deactivating %s @%s"] $name $v]"
 
     if { [string equal $name {}] } {
         throw registry::image-error "Registry error: Please specify the name of the port."

Modified: trunk/base/src/registry2.0/portuninstall.tcl
===================================================================
--- trunk/base/src/registry2.0/portuninstall.tcl	2008-04-29 03:18:38 UTC (rev 36378)
+++ trunk/base/src/registry2.0/portuninstall.tcl	2008-04-29 03:29:37 UTC (rev 36379)
@@ -90,7 +90,7 @@
         }
 	}
 
-	ui_msg "$UI_PREFIX [format [msgcat::mc "Uninstalling %s %s_%s%s"] $portname $version $revision $variants]"
+	ui_msg "$UI_PREFIX [format [msgcat::mc "Uninstalling %s @%s_%s%s"] $portname $version $revision $variants]"
 
     # pkg_uninstall isn't used anywhere as far as I can tell and I intend to add
     # some proper pre-/post- hooks to uninstall/deactivate.

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