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

larryv at macports.org larryv at macports.org
Wed Aug 17 08:46:40 PDT 2016


Revision: 151558
          https://trac.macports.org/changeset/151558
Author:   larryv at macports.org
Date:     2016-08-17 08:46:40 -0700 (Wed, 17 Aug 2016)
Log Message:
-----------
active_variants-1.1: Fix expressions

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	2016-08-17 14:59:26 UTC (rev 151557)
+++ trunk/dports/_resources/port1.0/group/active_variants-1.1.tcl	2016-08-17 15:46:40 UTC (rev 151558)
@@ -92,12 +92,12 @@
 	# path-style dependencies. This comes from port1.0/portutil.tcl and should
 	# probably not be considered public API.
 	set port [_get_dep_port $depspec]
-	if {$port == ""} {
+	if {$port eq ""} {
 	    ui_error "active_variants: Error: invalid port depspec '${depspec}'"
 	    ui_error "  expecting either: port or (bin|lib|path):foo:port"
 	    return 0
 	}
-	if {$depspec != $port} {
+	if {$depspec ne $port} {
 	    ui_debug "Checking $port for active variants for depspec '$depspec'"
 	}
 
@@ -157,7 +157,7 @@
 
 proc _variant_in_variant_list {needle haystack} {
 	foreach variant $haystack {
-		if {$variant == $needle} {
+		if {$variant eq $needle} {
 			return 1
 		}
 	}
@@ -233,7 +233,7 @@
 
 		if {[catch {set result [active_variants $depspec $required $forbidden]}] != 0} {
 		    set message "${port} is required, but not active."
-		    if {$method == activate} {
+		    if {$method eq "activate"} {
 			ui_msg "Warning: $message"
 		    } else {
 			error "$message"
@@ -249,11 +249,11 @@
 				set str_forbidden "without +[join $forbidden +]"
 			}
 			set str_combine ""
-			if {$str_required != "" && $str_forbidden != ""} {
+			if {$str_required ne "" && $str_forbidden ne ""} {
 				set str_combine " and "
 			}
 		        set message "${port} must be installed ${str_required}${str_combine}${str_forbidden}."
-		        if {$method == "activate"} {
+		        if {$method eq "activate"} {
 			    ui_msg "Warning: $message"
 			} else {
 			    error "$message"
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160817/a204b1d4/attachment.html>


More information about the macports-changes mailing list