From cf4dcc72061908568fe6fa66f776512429c9c6b8 Mon Sep 17 00:00:00 2001
From: Timothée Ravier <tim@siosm.fr>
Date: Sep 27 2023 08:53:32 +0000
Subject: comps-sync.py: Unify group loading logic


---

diff --git a/comps-sync.py b/comps-sync.py
index c94ec95..1b14b08 100755
--- a/comps-sync.py
+++ b/comps-sync.py
@@ -123,10 +123,8 @@ for gid in ws_environ.group_ids:
     exclude_list = comps_exclude_list.get(gid.name, set())
     ws_pkgs = load_packages_from_comps_group(ws_pkgs, comps, gid.name, exclude_list, comps_exclude_list_all)
 
-ws_ostree_pkgs = set()
-for pkg in comps.groups_match(id=ws_ostree_name)[0].packages:
-    if not is_exclude_listed(pkg.name, comps_exclude_list_all):
-        ws_ostree_pkgs.add(pkg.name)
+exclude_list = comps_exclude_list.get(ws_ostree_name, set())
+ws_pkgs = load_packages_from_comps_group(ws_pkgs, comps, ws_ostree_name, exclude_list, comps_exclude_list_all)
 
 comps_unknown = set()
 for arch in manifest_packages:
@@ -137,8 +135,7 @@ for arch in manifest_packages:
         else:
             if pkg in ws_pkgs and arch in ws_pkgs[pkg][2]:
                 continue
-        if (pkg not in comps_include_list and
-            pkg not in ws_ostree_pkgs):
+        if (pkg not in comps_include_list):
             comps_unknown.add((pkg, arch))
 
 # Look for packages in the manifest but not in comps at all
diff --git a/fedora-common-ostree-pkgs.yaml b/fedora-common-ostree-pkgs.yaml
index 00a3128..34a6717 100644
--- a/fedora-common-ostree-pkgs.yaml
+++ b/fedora-common-ostree-pkgs.yaml
@@ -119,6 +119,7 @@ packages:
   - opensc
   - openssh-clients
   - openssh-server
+  - ostree-grub2
   - pam_afs_session
   - paps
   - passwd
@@ -147,6 +148,7 @@ packages:
   - realtek-firmware
   - rootfiles
   - rpm
+  - rpm-ostree
   - rsync
   - samba-client
   - selinux-policy-targeted
diff --git a/fedora-common-ostree.yaml b/fedora-common-ostree.yaml
index 5ddaae2..524e0b0 100644
--- a/fedora-common-ostree.yaml
+++ b/fedora-common-ostree.yaml
@@ -22,7 +22,6 @@ packages:
   # Explicitely add Git docs
   - git-core-doc
   - lvm2
-  - rpm-ostree
   # Required for compatibility with old bootloaders until we have bootupd
   # See https://github.com/fedora-silverblue/issue-tracker/issues/120
   - ostree-grub2