Ticket #38117: a_v_1.1_add-path.diff

active_variants-1.1.tcl

@@ -45 +45 @@
 #
 # where
 #  $name
-#    is the name of the port you're trying to check (required)
+#    is the name of the port you're trying to check (required), which can be
+#    specified as either just the port, or via "(bin:lib:path):FOO:port"
+#    as accepted by the dependency parser.
 #  $required
 #    is a list of variants that must be enabled for the test to succeed
 #    (required; remember this can also be a space-separated string or just
@@ -104 +106 @@
         # same time). This explains the [lindex $active_list 0] in the following
         # block.
 
+        # get the port which will provide $name
+        set port [_get_dep_port $name]
+        if {$port == ""} {
+            ui_error "active_variants: Error: invalid port name '${name}'"
+            ui_error "  expecting either: port or (bin:lib:path):FOO:port"
+            return 0
+        }
+        if {$name != $port} {
+            ui_debug "Checking $port for active variants for depspec '$name'"
+        }
+
         # this will throw if $name isn't active
-        set installed [lindex [registry_active $name] 0]
+        set installed [lindex [registry_active $port] 0]
 
         # In $installed there are in order: name, version, revision, variants,
         # a boolean indicating whether the port is installed and the epoch. So,
         # we're interested in the field at offset 3.
         set variants [lindex $installed 3]
-        ui_debug "$name is installed with the following variants: $variants"
+        ui_debug "$port is installed with the following variants: $variants"
         ui_debug "  required: $required, forbidden: $forbidden"
 
         # split by "+" into the separate variant names