From f8b06f7edc693313e0aab2d467cd6555bd144a7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= <adrian@suse.de>
Date: Thu, 7 Mar 2024 12:44:12 +0100
Subject: [PATCH] write group support status

---
 pkglistgen/tool.py | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkglistgen/tool.py b/pkglistgen/tool.py
index 9b49271b..5faf577d 100644
--- a/pkglistgen/tool.py
+++ b/pkglistgen/tool.py
@@ -153,6 +153,8 @@ class PkgListGen(ToolBase.ToolBase):
                     if arch != '*':
                         opfh.write(f"_{arch}")
                     opfh.write('\n')
+                    if group.default_support_status and group.default_support_status != 'unsupported':
+                        opfh.write(f"  supportstatus: {group.default_support_status}\n")
                     opfh.write('  flavors:\n')
                     for f in group.flavors:
                         opfh.write(f"  - {f}\n")
@@ -767,15 +769,12 @@ class PkgListGen(ToolBase.ToolBase):
                     break
                 new_lines.append(line)
             open(os.path.join(self.productcompose_dir, 'default.productcompose'), 'w').write(''.join(new_lines))
-<<<<<<< HEAD
             if git_url:
                 logging.debug(subprocess.check_output(
                     ['git', 'add', self.productcompose_dir, f"{self.productcompose_dir}/default.productcompose"],
                     cwd=cache_dir, encoding='utf-8'))
-=======
             if os.path.isfile(os.path.join(group_dir, 'supportstatus.txt')):
                 shutil.copy(os.path.join(group_dir, 'supportstatus.txt'), self.productcompose_dir)
->>>>>>> 8c7c16b8 (git cleanup)
             self.skip_productcompose = False
         else:
             # No template file, so we don't create one either
@@ -883,15 +882,7 @@ class PkgListGen(ToolBase.ToolBase):
                     f.write(line + '\n')
 
         if git_url:
-<<<<<<< HEAD
-            if os.path.isfile(f"{productcompose_dir}/default.productcompose"):
-                logging.debug(subprocess.check_output(
-                    ['git', 'add', productcompose_dir, f"{productcompose_dir}/default.productcompose"],
-                    cwd=cache_dir, encoding='utf-8'))
-            if os.path.isdir(product_dir):
-=======
             if product_dir and os.path.isdir(product_dir):
->>>>>>> 8c7c16b8 (git cleanup)
                 logging.debug(subprocess.check_output(
                     ['git', 'add', productcompose_dir, product_dir],
                     cwd=cache_dir, encoding='utf-8'))