From abd56aaf71c0c278b8acb31c7b7ddf69ad3dfd16 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Jun 02 2023 09:52:22 +0000
Subject: Add support for ostree desktop variants


Example failure message:
```
[FAIL] Ostree installer (variant Onyx, arch x86_64) failed, but going on anyway.
```

Needs: https://pagure.io/fedora-kickstarts/pull-request/961

---

diff --git a/compose_tracker.py b/compose_tracker.py
index 1b83b38..48c1bea 100755
--- a/compose_tracker.py
+++ b/compose_tracker.py
@@ -199,11 +199,14 @@ class Consumer(object):
         maintainers_info = toml.loads(req.text)
         try:
             if line != 'eln':
-                matching_lists = re.findall(r'variant (\w+), arch (\S+), subvariant (\w+)', line)
+                matching_lists = re.findall(r'variant (\w+), arch (\S+)(, subvariant (\w+))*', line)
                 if matching_lists:
                     for ml in matching_lists:
                         # For all arches
                         if ml[1] == '*':
+                            # Special case for ostree variants that do not have a subvariant
+                            if not ml[2]:
+                                ml[2] = ml[0]
                             # Get the list of all maintainers for all arches for that variant and sub variant
                             maintainers_list = list(maintainers_info.get(ml[0].lower()).get(ml[2].lower()).values())
                             # Get the list of all fas usernames from the above list

