From 1d654522bef012ded28ea0951aee299b097e1135 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Sedl=C3=A1=C5=99?= <lsedlar@redhat.com>
Date: Thu, 4 Nov 2021 10:21:07 +0100
Subject: [PATCH] Remove with_jigdo argument
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

It was checked in a condition together with the configuration value, and
only ever explicitly used with the same value.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
---
 pungi/phases/createiso.py      | 6 ++----
 pungi/phases/extra_isos.py     | 1 -
 tests/test_extra_isos_phase.py | 5 -----
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/pungi/phases/createiso.py b/pungi/phases/createiso.py
index 895c588c..d73ec056 100644
--- a/pungi/phases/createiso.py
+++ b/pungi/phases/createiso.py
@@ -517,15 +517,13 @@ def add_iso_to_metadata(
     return img
 
 
-def run_createiso_command(
-    num, compose, bootable, arch, cmd, mounts, log_file, with_jigdo=False
-):
+def run_createiso_command(num, compose, bootable, arch, cmd, mounts, log_file):
     packages = [
         "coreutils",
         "xorriso" if compose.conf.get("createiso_use_xorrisofs") else "genisoimage",
         "isomd5sum",
     ]
-    if with_jigdo and compose.conf["create_jigdo"]:
+    if compose.conf["create_jigdo"]:
         packages.append("jigdo")
     if bootable:
         extra_packages = {
diff --git a/pungi/phases/extra_isos.py b/pungi/phases/extra_isos.py
index 31139159..dd0c65fb 100644
--- a/pungi/phases/extra_isos.py
+++ b/pungi/phases/extra_isos.py
@@ -164,7 +164,6 @@ class ExtraIsosThread(WorkerThread):
                 log_file=compose.paths.log.log_file(
                     arch, "extraiso-%s" % os.path.basename(iso_path)
                 ),
-                with_jigdo=compose.conf["create_jigdo"],
             )
 
         img = add_iso_to_metadata(
diff --git a/tests/test_extra_isos_phase.py b/tests/test_extra_isos_phase.py
index 9dcd75e1..3e51c266 100644
--- a/tests/test_extra_isos_phase.py
+++ b/tests/test_extra_isos_phase.py
@@ -148,7 +148,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )
@@ -224,7 +223,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )
@@ -298,7 +296,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )
@@ -374,7 +371,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/x86_64/extraiso-my.iso.x86_64.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )
@@ -445,7 +441,6 @@ class ExtraIsosThreadTest(helpers.PungiTestCase):
                     log_file=os.path.join(
                         self.topdir, "logs/src/extraiso-my.iso.src.log"
                     ),
-                    with_jigdo=False,
                 )
             ],
         )