[24543] trunk/base/src/registry1.0/portimage.tcl

[source_changes at macosforge.org]

Revision: 24543
          http://trac.macosforge.org/projects/macports/changeset/24543
Author:   jberry at macports.org
Date:     2007-04-27 16:02:52 -0700 (Fri, 27 Apr 2007)

Log Message:
-----------
Revise error output in image mode to show the port + version in the same syntax as would be required to deactivate or uninstall the port we complain about

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

Modified: trunk/base/src/registry1.0/portimage.tcl
===================================================================
--- trunk/base/src/registry1.0/portimage.tcl	2007-04-27 22:48:16 UTC (rev 24542)
+++ trunk/base/src/registry1.0/portimage.tcl	2007-04-27 23:02:52 UTC (rev 24543)
@@ -95,7 +95,7 @@
 			set	ivariants [lindex $i 3]
 			set iactive [lindex $i 4]
 			if { ![string equal ${iversion}_${irevision}${ivariants} ${version}_${revision}${variants}] && $iactive == 1 } {
-				return -code error "Image error: Another version of $iname (${iversion}_${irevision}${ivariants}) is already active."
+				return -code error "Image error: Another version of this port ($iname @${iversion}_${irevision}${ivariants}) is already active."
 			}
 		}
 	}
@@ -103,13 +103,13 @@
 	set ref [registry::open_entry $name $version $revision $variants]
 	
 	if { ![string equal [registry::property_retrieve $ref installtype] "image"] } {
-		return -code error "Image error: ${name} ${version}_${revision}${variants} not installed as an image."
+		return -code error "Image error: ${name} @${version}_${revision}${variants} not installed as an image."
 	}
 	if { [registry::property_retrieve $ref active] != 0 } {
-		return -code error "Image error: ${name} ${version}_${revision}${variants} is already active."
+		return -code error "Image error: ${name} @${version}_${revision}${variants} is already active."
 	} 
 	if { [registry::property_retrieve $ref compact] != 0 } {
-		return -code error "Image error: ${name} ${version}_${revision}${variants} is compactd."
+		return -code error "Image error: ${name} @${version}_${revision}${variants} is compactd."
 	} 
 
 	set imagedir [registry::property_retrieve $ref imagedir]
@@ -162,13 +162,13 @@
 	set ref [registry::open_entry $name $version $revision $variants]
 
 	if { ![string equal [registry::property_retrieve $ref installtype] "image"] } {
-		return -code error "Image error: ${name} ${fqversion} not installed as an image."
+		return -code error "Image error: ${name} @${fqversion} not installed as an image."
 	}
 	if { [registry::property_retrieve $ref active] != 1 } {
-		return -code error "Image error: ${name} ${fqversion} is not active."
+		return -code error "Image error: ${name} @${fqversion} is not active."
 	} 
 	if { [registry::property_retrieve $ref compact] != 0 } {
-		return -code error "Image error: ${name} ${fqversion} is compactd."
+		return -code error "Image error: ${name} @${fqversion} is compactd."
 	} 
 
 	set imagedir [registry::property_retrieve $ref imagedir]

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