From 869a544e7b4e22a3f81c5491807f93b58fd3b28f Mon Sep 17 00:00:00 2001
From: Ondrej Nosek <onosek@redhat.com>
Date: Mar 21 2023 14:35:55 +0000
Subject: Alow retiring packages during release freeze


JIRA: RHELCMP-11389
Fixes: #506

Signed-off-by: Ondrej Nosek <onosek@redhat.com>

---

diff --git a/fedpkg/cli.py b/fedpkg/cli.py
index 57659af..5c5cc71 100644
--- a/fedpkg/cli.py
+++ b/fedpkg/cli.py
@@ -1555,7 +1555,7 @@ class fedpkgClient(cliClient):
             state = get_fedora_release_state(self.config, self.name, self.cmd.branch_merge)
 
             # Allow retiring in Rawhide and Branched until Final Freeze
-            if state is None or state == 'pending':
+            if state is None or state in ('pending', 'frozen'):
                 super(fedpkgClient, self).retire()
                 self.do_disable_monitoring()
             else:
diff --git a/test/test_cli.py b/test/test_cli.py
index 84d1935..894d835 100644
--- a/test/test_cli.py
+++ b/test/test_cli.py
@@ -2307,7 +2307,9 @@ class TestReadReleasesFromLocalConfig(CliTestCase):
                         content='[koji]\ntargets=rawhide f28 fedora epel')
 
     @patch('os.path.exists', return_value=False)
-    def test_no_config_file_is_create(self, exists):
+    @patch('pyrpkg.utils.validate_path')
+    def test_no_config_file_is_create(self, validate_path, exists):
+        validate_path.return_value = self.cloned_repo_path
         with patch('sys.argv', new=self.fake_cmd):
             cli = self.new_cli()
 
@@ -2547,7 +2549,7 @@ class TestRetire(CliTestCase):
     def test_retire_fedora_release(self):
         self.do_not_retire_release("f30", "disabled")
         self.retire_release("f30", "pending")
-        self.do_not_retire_release("f30", "frozen")
+        self.retire_release("f30", "frozen")
         self.do_not_retire_release("f30", "current")
         self.do_not_retire_release("f30", "archived")
         self.retire_release("unknown_fedora_release", None)