[106768] trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl

[cal at macports.org]

Revision: 106768
          https://trac.macports.org/changeset/106768
Author:   cal at macports.org
Date:     2013-06-07 07:52:02 -0700 (Fri, 07 Jun 2013)
Log Message:
-----------
active_variants: don't print depspec in user-visible error message

Modified Paths:
--------------
    trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl

Modified: trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl
===================================================================
--- trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl	2013-06-07 13:58:41 UTC (rev 106767)
+++ trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl	2013-06-07 14:52:02 UTC (rev 106768)
@@ -179,10 +179,11 @@
 	global _require_active_variants_list
 	foreach _require_active_variant $_require_active_variants_list {
 		set name [lindex $_require_active_variant 0]
+		set port [_get_dep_port $name]
 		set required [lindex $_require_active_variant 1]
 		set forbidden [lindex $_require_active_variant 2]
 		if {[catch {set result [active_variants $name $required $forbidden]}] != 0} {
-			error "$name is required, but not active."
+			error "${port} is required, but not active."
 		}
 		if {!$result} {
 			set str_required ""
@@ -197,7 +198,7 @@
 			if {$str_required != "" && $str_forbidden != ""} {
 				set str_combine " and "
 			}
-			error "$name must be installed ${str_required}${str_combine}${str_forbidden}."
+			error "${port} must be installed ${str_required}${str_combine}${str_forbidden}."
 		}
 	}
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130607/43f442d5/attachment.html>