[24548] trunk/base/src/registry1.0

[source_changes at macosforge.org]

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

Log Message:
-----------
A few more usages of @version syntax.

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

Modified: trunk/base/src/registry1.0/receipt_flat.tcl
===================================================================
--- trunk/base/src/registry1.0/receipt_flat.tcl	2007-04-27 23:23:15 UTC (rev 24547)
+++ trunk/base/src/registry1.0/receipt_flat.tcl	2007-04-27 23:33:16 UTC (rev 24548)
@@ -111,7 +111,7 @@
 		
 		if {![string length $receipt_file]} {
 			if { $version != 0 } {
-				return -code error "Registry error: ${name} ${version}_${revision}${variants} not registered as installed."
+				return -code error "Registry error: ${name} @${version}_${revision}${variants} not registered as installed."
 			} else {
 				return -code error "Registry error: ${name} not registered as installed."
 			}
@@ -138,7 +138,7 @@
 		}
 	
 		if { ![entry_exists $name $version $revision $variants] } {
-			return -code error "Registry error: ${name} ${version}_${revision}${variants} not registered as installed."
+			return -code error "Registry error: ${name} @${version}_${revision}${variants} not registered as installed."
 		}
 	
 		set receipt_path [file join ${darwinports::registry.path} receipts ${name} ${version}_${revision}${variants}]
@@ -154,7 +154,7 @@
 		set receipt_contents [read $receipt_handle]
 		close $receipt_handle
 	} else {
-		return -code error "Registry error: receipt for ${name} ${version}_${revision}${variants} seems to be compressed, but bzip2 couln't be found."
+		return -code error "Registry error: receipt for ${name} @${version}_${revision}${variants} seems to be compressed, but bzip2 couln't be found."
 	}
 
 	set ref [new_entry]
@@ -176,7 +176,7 @@
 	} elseif {[string match "# Version: *" $receipt_contents]} {
 		# This is new format
 		if {![string match "# Version: 1.0*" $receipt_contents]} {
-			return -code error "Registry error: receipt ${name} ${version}_${revision}${variants} is in an unknown format (version too new?)."
+			return -code error "Registry error: receipt ${name} @${version}_${revision}${variants} is in an unknown format (version too new?)."
 		}
 
 		# Remove any line starting with #

Modified: trunk/base/src/registry1.0/registry.tcl
===================================================================
--- trunk/base/src/registry1.0/registry.tcl	2007-04-27 23:23:15 UTC (rev 24547)
+++ trunk/base/src/registry1.0/registry.tcl	2007-04-27 23:33:16 UTC (rev 24548)
@@ -71,7 +71,7 @@
 
 		return $ref
 	} else {
-		return -code error "Registry error: ${name} ${version}_${revision}${variants} already registered as installed.  Please uninstall it first."
+		return -code error "Registry error: ${name} @${version}_${revision}${variants} already registered as installed.  Please uninstall it first."
 	}
 }
 
@@ -217,9 +217,9 @@
 			set ivariants [lindex $i 3]
 			set iactive [lindex $i 4]
 			if { $iactive == 0 } {
-				puts "	$iname ${iversion}_${irevision}${ivariants}"
+				puts "	$iname @${iversion}_${irevision}${ivariants}"
 			} elseif { $iactive == 1 } {
-				puts "	$iname ${iversion}_${irevision}${ivariants} (active)"
+				puts "	$iname @${iversion}_${irevision}${ivariants} (active)"
 			}
 		}
 		return -1

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