Merge #321 Add support for top-level variant IDs with dashes.

tests/data/dummy-variants.xml

@@ -73,4 +73,29 @@
     </variants>
   </variant>
 
+  <!-- layered products - Tools for Foo and Bar variants from a base product -->
+  <variant id="Foo-Tools" name="Tools" type="variant" has_optional="false">
+    <arches>
+      <arch>x86_64</arch>
+    </arches>
+    <groups>
+      <group default="true" uservisible="true">core</group>
+    </groups>
+    <environments>
+      <environment>minimal</environment>
+    </environments>
+  </variant>
+
+  <variant id="Bar-Tools" name="Tools" type="variant" has_optional="false">
+    <arches>
+      <arch>x86_64</arch>
+    </arches>
+    <groups>
+      <group default="true" uservisible="true">core</group>
+    </groups>
+    <environments>
+      <environment>minimal</environment>
+    </environments>
+  </variant>
+
 </variants>

tests/test_compose.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export PYTHONPATH=$(pwd)/../
+export PYTHONPATH=$(pwd)/../:$PYTHONPATH
 export PATH=$(pwd)/../bin:$PATH
 
 mkdir -p _composes