From aeaa4f192cfd126ddf871a4bab3938f78c3720a4 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Sep 19 2023 05:47:01 +0000
Subject: [PATCH 1/2] build_scheduler: show interrupted as yellow


Interrupting BuildSchedulerDisplay does not cancel builds in progress in
koji, so use a different color to avoid confusion with build failures.

---

diff --git a/flatpak_module_tools/build_scheduler.py b/flatpak_module_tools/build_scheduler.py
index 9148e1b..e88a174 100644
--- a/flatpak_module_tools/build_scheduler.py
+++ b/flatpak_module_tools/build_scheduler.py
@@ -105,12 +105,13 @@ class BuildSchedulerDisplay(LiveDisplay):
                 elif item.state == State.FAILED:
                     fg = "red"
                 elif item.state == State.BUILDING:
-                    if when in (RenderWhen.INTERRUPTED, RenderWhen.EXCEPTION):
+                    if when == RenderWhen.EXCEPTION:
                         fg = "red"
+                    elif when == RenderWhen.INTERRUPTED:
+                        fg = "yellow"
+                        status = "Interrupted"
                     else:
                         fg = "blue"
-                    if when == RenderWhen.INTERRUPTED:
-                        status = "Interrupted"
                 else:
                     fg = None
                 print(

From 06863a9fbcc3354b284c3338143c477d40d79d01 Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Sep 19 2023 15:44:43 +0000
Subject: [PATCH 2/2] koji_utils: fix quoting error


  File "flatpak_module_tools/koji_utils.py", line 90
    click.echo(f"Building {_format_link(url, build["nvr"])} succeeded!")
                                                    ^^^
SyntaxError: f-string: unmatched '['

---

diff --git a/flatpak_module_tools/koji_utils.py b/flatpak_module_tools/koji_utils.py
index e2ca642..5022356 100644
--- a/flatpak_module_tools/koji_utils.py
+++ b/flatpak_module_tools/koji_utils.py
@@ -87,7 +87,7 @@ def watch_koji_task(profile: ProfileConfig, task_id: int):
 
             url_base = profile.koji_options['weburl']
             url = f"{url_base}/buildinfo?buildID={build['build_id']}"
-            click.echo(f"Building {_format_link(url, build["nvr"])} succeeded!")
+            click.echo(f"Building {_format_link(url, build['nvr'])} succeeded!")
         else:
             click.echo("Build succeeded!")