Changeset 36379

Timestamp:

04/28/2008 20:29:37 (4 years ago)

Author:

raimue@…

Message:

base/src:
Adapting $portname @$version notation

Location:

trunk/base/src

Files:

• macports1.0/macports.tcl (modified) (2 diffs)
• port1.0/portinstall.tcl (modified) (1 diff)
• registry1.0/portimage.tcl (modified) (2 diffs)
• registry1.0/portuninstall.tcl (modified) (1 diff)
• registry2.0/portimage.tcl (modified) (2 diffs)
• registry2.0/portuninstall.tcl (modified) (1 diff)

trunk/base/src/macports1.0/macports.tcl

@@ -1967 +1967 @@
                         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
                     }
@@ -1975 +1975 @@
         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
             }

trunk/base/src/port1.0/portinstall.tcl

@@ -49 +49 @@
 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]"
 }
 

trunk/base/src/registry1.0/portimage.tcl

@@ -80 +80 @@
         }
 
-        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]
@@ -143 +143 @@
         }
 
-        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]

trunk/base/src/registry1.0/portuninstall.tcl

@@ -129 +129 @@
         }
 
-        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

trunk/base/src/registry2.0/portimage.tcl

@@ -78 +78 @@
     }
 
-    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 {
@@ -132 +132 @@
     }
 
-    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 {}] } {

trunk/base/src/registry2.0/portuninstall.tcl

@@ -91 +91 @@
         }
 
-        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