From dc5f88e30b2259cb3250d4ea04c7738578244d7a Mon Sep 17 00:00:00 2001
From: Trinity Quirk <tquirk@ciq.com>
Date: Tue, 4 Feb 2025 11:04:11 -0800
Subject: [PATCH 1/5] Remove unused variables and code

A quick flake8 run showed a good number of imports and variables that
were unused.  We also found some object attributes that were unused.

Also took the opportunity to eliminate commented code.

Importing `os` also pulls in `os.path`, so there's no need to import
both.  Removed that from several files.
---
 .../empanadas/backends/imagefactory.py        |  1 -
 .../empanadas/builders/imagebuild.py          |  1 -
 iso/empanadas/empanadas/common.py             | 14 ---
 .../empanadas/scripts/build_iso_extra.py      |  1 -
 .../empanadas/scripts/build_iso_live.py       |  1 -
 .../empanadas/scripts/build_iso_live_test.py  |  2 -
 .../empanadas/scripts/generate_compose.py     |  1 -
 .../empanadas/scripts/pull_cloud_image.py     |  1 -
 .../empanadas/scripts/pull_iso_image.py       |  1 -
 .../empanadas/scripts/pull_unpack_tree.py     |  1 -
 .../scripts/sync_from_peridot_test.py         |  2 -
 iso/empanadas/empanadas/scripts/sync_sig.py   |  4 -
 .../empanadas/scripts/test_module.py          |  2 -
 iso/empanadas/empanadas/util/dnf_utils.py     | 68 +++----------
 iso/empanadas/empanadas/util/iso_utils.py     | 99 ++-----------------
 iso/empanadas/empanadas/util/shared.py        | 28 +-----
 mangle/generators/prepopulate_parser.py       |  1 -
 mangle/generators/version_metadata_parser.py  |  1 -
 mangle/generators/version_parser.py           |  1 -
 19 files changed, 25 insertions(+), 205 deletions(-)

diff --git a/iso/empanadas/empanadas/backends/imagefactory.py b/iso/empanadas/empanadas/backends/imagefactory.py
index 70ece6e..378b7d8 100644
--- a/iso/empanadas/empanadas/backends/imagefactory.py
+++ b/iso/empanadas/empanadas/backends/imagefactory.py
@@ -275,7 +275,6 @@ def setup_staging(self):
                     "VMware": {"format": "vmdk", "provider": "vmware_desktop"}
                     }
             output = f"{_map[self.ctx.variant]['format']}"  # type: ignore
-            provider = f"{_map[self.ctx.variant]['provider']}"  # type: ignore
 
             # pop from the options map that will be passed to the vagrant metadata.json
             convert_options = _map[self.ctx.variant].pop('convertOptions') if 'convertOptions' in _map[self.ctx.variant].keys() else ''  # type: ignore
diff --git a/iso/empanadas/empanadas/builders/imagebuild.py b/iso/empanadas/empanadas/builders/imagebuild.py
index 3e128f2..88c07bf 100644
--- a/iso/empanadas/empanadas/builders/imagebuild.py
+++ b/iso/empanadas/empanadas/builders/imagebuild.py
@@ -2,7 +2,6 @@
 
 import datetime
 import logging
-import os
 import pathlib
 
 from attrs import define, field
diff --git a/iso/empanadas/empanadas/common.py b/iso/empanadas/empanadas/common.py
index f2a43e5..7e85939 100644
--- a/iso/empanadas/empanadas/common.py
+++ b/iso/empanadas/empanadas/common.py
@@ -2,7 +2,6 @@
 import glob
 import platform
 import time
-from collections import defaultdict
 from attrs import define, field
 
 
@@ -96,21 +95,8 @@ class Color:
     with open(conf, "r", encoding="utf-8") as file:
         sigdict.update(yaml.safe_load(file))
 
-# The system needs to be a RHEL-like system. It cannot be Fedora or SuSE.
-# if "%rhel" in config['rlmacro']:
-#    raise SystemExit(Color.BOLD + 'This is not a RHEL-like system.' + Color.END
-#            + '\n\nPlease verify you are running on a RHEL-like system that is '
-#            'not Fedora nor SuSE. This means that the %rhel macro will be '
-#            'defined with a value equal to the version you are targetting. RHEL'
-#            ' and its derivatives have this set.')
 
 
-# These will be set in their respective var files
-# REVISION = rlvars['revision'] + '-' + rlvars['rclvl']
-# rlvars = rldict[rlver]
-# rlvars = rldict[rlmacro]
-# COMPOSE_ISO_WORKDIR = COMPOSE_ROOT + "work/" + arch + "/" + date_stamp
-
 
 ALLOWED_TYPE_VARIANTS = {
     "Azure": ["Base", "LVM"],
diff --git a/iso/empanadas/empanadas/scripts/build_iso_extra.py b/iso/empanadas/empanadas/scripts/build_iso_extra.py
index 521443b..1b2fef7 100755
--- a/iso/empanadas/empanadas/scripts/build_iso_extra.py
+++ b/iso/empanadas/empanadas/scripts/build_iso_extra.py
@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="ISO Compose")
diff --git a/iso/empanadas/empanadas/scripts/build_iso_live.py b/iso/empanadas/empanadas/scripts/build_iso_live.py
index 450a1ad..8dd2404 100755
--- a/iso/empanadas/empanadas/scripts/build_iso_live.py
+++ b/iso/empanadas/empanadas/scripts/build_iso_live.py
@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import LiveBuild
 
 parser = argparse.ArgumentParser(description="Live ISO Compose")
diff --git a/iso/empanadas/empanadas/scripts/build_iso_live_test.py b/iso/empanadas/empanadas/scripts/build_iso_live_test.py
index 7db3b53..8dd99c0 100755
--- a/iso/empanadas/empanadas/scripts/build_iso_live_test.py
+++ b/iso/empanadas/empanadas/scripts/build_iso_live_test.py
@@ -3,8 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
-from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="Live ISO Compose")
 
diff --git a/iso/empanadas/empanadas/scripts/generate_compose.py b/iso/empanadas/empanadas/scripts/generate_compose.py
index 88ce69e..91ba716 100755
--- a/iso/empanadas/empanadas/scripts/generate_compose.py
+++ b/iso/empanadas/empanadas/scripts/generate_compose.py
@@ -7,7 +7,6 @@
 
 from empanadas.common import *
 from empanadas.util import Checks
-from empanadas.util import RepoSync
 from empanadas.util import Shared
 
 # Start up the parser baby
diff --git a/iso/empanadas/empanadas/scripts/pull_cloud_image.py b/iso/empanadas/empanadas/scripts/pull_cloud_image.py
index ffcbb4c..54c6196 100755
--- a/iso/empanadas/empanadas/scripts/pull_cloud_image.py
+++ b/iso/empanadas/empanadas/scripts/pull_cloud_image.py
@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="ISO Artifact Builder")
diff --git a/iso/empanadas/empanadas/scripts/pull_iso_image.py b/iso/empanadas/empanadas/scripts/pull_iso_image.py
index 0e6e114..10c8965 100755
--- a/iso/empanadas/empanadas/scripts/pull_iso_image.py
+++ b/iso/empanadas/empanadas/scripts/pull_iso_image.py
@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="ISO Artifact Builder")
diff --git a/iso/empanadas/empanadas/scripts/pull_unpack_tree.py b/iso/empanadas/empanadas/scripts/pull_unpack_tree.py
index 743c33a..77734b2 100755
--- a/iso/empanadas/empanadas/scripts/pull_unpack_tree.py
+++ b/iso/empanadas/empanadas/scripts/pull_unpack_tree.py
@@ -3,7 +3,6 @@
 import argparse
 
 from empanadas.common import *
-from empanadas.util import Checks
 from empanadas.util import IsoBuild
 
 parser = argparse.ArgumentParser(description="ISO Artifact Builder")
diff --git a/iso/empanadas/empanadas/scripts/sync_from_peridot_test.py b/iso/empanadas/empanadas/scripts/sync_from_peridot_test.py
index 96ff596..09cf14d 100755
--- a/iso/empanadas/empanadas/scripts/sync_from_peridot_test.py
+++ b/iso/empanadas/empanadas/scripts/sync_from_peridot_test.py
@@ -1,7 +1,5 @@
 # This is a testing script to ensure the RepoSync class is working as intended.
 
-import argparse
-
 import empanadas
 from empanadas.common import *
 from empanadas.util import Checks
diff --git a/iso/empanadas/empanadas/scripts/sync_sig.py b/iso/empanadas/empanadas/scripts/sync_sig.py
index 2c901e4..d7e8fdd 100755
--- a/iso/empanadas/empanadas/scripts/sync_sig.py
+++ b/iso/empanadas/empanadas/scripts/sync_sig.py
@@ -5,10 +5,6 @@
 from empanadas.util import Checks
 from empanadas.util import SigRepoSync
 
-#rlvars = rldict['9']
-#r = Checks(rlvars, config['arch'])
-#r.check_validity()
-
 # Start up the parser baby
 parser = argparse.ArgumentParser(description="Peridot Sync and Compose")
 
diff --git a/iso/empanadas/empanadas/scripts/test_module.py b/iso/empanadas/empanadas/scripts/test_module.py
index 769900d..d2f1891 100755
--- a/iso/empanadas/empanadas/scripts/test_module.py
+++ b/iso/empanadas/empanadas/scripts/test_module.py
@@ -2,11 +2,9 @@
 
 import argparse
 import sys
-#import createrepo_c as cr
 
 from empanadas.common import *
 from empanadas.util import Checks
-from empanadas.util import RepoSync
 
 # Start up the parser baby
 parser = argparse.ArgumentParser(description="Peridot Upstream Repoclosure")
diff --git a/iso/empanadas/empanadas/util/dnf_utils.py b/iso/empanadas/empanadas/util/dnf_utils.py
index 516ddb6..4cc79d4 100644
--- a/iso/empanadas/empanadas/util/dnf_utils.py
+++ b/iso/empanadas/empanadas/util/dnf_utils.py
@@ -3,16 +3,14 @@
 
 Louis Abel <label AT rockylinux.org>
 """
-#import shutil
+
 import logging
 import sys
 import os
-import os.path
 import subprocess
 import shlex
 import time
 import glob
-#import pipes
 
 from jinja2 import Environment, FileSystemLoader
 
@@ -20,14 +18,6 @@
 from empanadas.common import Color, _rootdir
 from empanadas.util import Shared
 
-# initial treeinfo data is made here
-import productmd.treeinfo
-
-#HAS_LIBREPO = True
-#try:
-#    import librepo
-#except:
-#    HAS_LIBREPO = False
 
 class RepoSync:
     """
@@ -298,7 +288,6 @@ def run(self):
             Shared.deploy_extra_files(self.extra_files, sync_root, global_work_root, self.log)
             self.deploy_treeinfo(self.repo, sync_root, self.arch)
             self.tweak_treeinfo(self.repo, sync_root, self.arch)
-            #self.symlink_to_latest(generated_dir)
             Shared.symlink_to_latest(self.shortname, self.major_version,
                     generated_dir, self.compose_latest_dir, self.log)
 
@@ -354,9 +343,7 @@ def podman_sync(
         wait till all is finished
         """
         cmd = Shared.podman_cmd(self.log)
-        contrunlist = []
         bad_exit_list = []
-        extra_dnf_args = ' '.join(self.extra_dnf_args.copy())
         reposync_delete = '--delete' if self.reposync_clean_old else ''
         self.log.info('Generating container entries')
         entries_dir = os.path.join(work_root, "entries")
@@ -569,7 +556,6 @@ def podman_sync(
             # Spawn up all podman processes for repo
             self.log.info(Color.INFO + 'Starting podman processes for %s ...' % r)
 
-            #print(entry_name_list)
             for pod in entry_name_list:
                 podman_cmd_entry = '{} run -d -it --security-opt label=disable -v "{}:{}" -v "{}:{}" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
                         cmd,
@@ -584,8 +570,7 @@ def podman_sync(
                         pod,
                         self.container
                 )
-                #print(podman_cmd_entry)
-                process = subprocess.call(
+                subprocess.call(
                         shlex.split(podman_cmd_entry),
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.DEVNULL
@@ -597,8 +582,7 @@ def podman_sync(
             self.log.info(Color.INFO + 'Arches: ' + ' '.join(arch_sync))
             pod_watcher = f'{cmd} wait {join_all_pods}'
 
-            #print(pod_watcher)
-            watch_man = subprocess.call(
+            subprocess.call(
                     shlex.split(pod_watcher),
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL
@@ -606,7 +590,6 @@ def podman_sync(
 
             # After the above is done, we'll check each pod process for an exit
             # code.
-            pattern = "Exited (0)"
             for pod in entry_name_list:
                 checkcmd = f'{cmd} ps -f status=exited -f name={pod}'
                 podcheck = subprocess.Popen(
@@ -623,7 +606,7 @@ def podman_sync(
 
             rmcmd = f'{cmd} rm {join_all_pods}'
 
-            rmpod = subprocess.Popen(
+            subprocess.Popen(
                     rmcmd,
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL,
@@ -741,8 +724,7 @@ def repoclosure_work(self, sync_root, work_root, log_root):
                         pod,
                         self.container
                 )
-                #print(podman_cmd_entry)
-                process = subprocess.call(
+                subprocess.call(
                         shlex.split(podman_cmd_entry),
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.DEVNULL
@@ -753,7 +735,7 @@ def repoclosure_work(self, sync_root, work_root, log_root):
             self.log.info('Performing repoclosure on %s ... ' % repo)
             pod_watcher = f'{cmd} wait {join_all_pods}'
 
-            watch_man = subprocess.call(
+            subprocess.call(
                     shlex.split(pod_watcher),
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL
@@ -775,7 +757,7 @@ def repoclosure_work(self, sync_root, work_root, log_root):
 
             rmcmd = f'{cmd} rm {join_all_pods}'
 
-            rmpod = subprocess.Popen(
+            subprocess.Popen(
                     rmcmd,
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL,
@@ -871,7 +853,6 @@ def deploy_treeinfo(self, repo, sync_root, arch, refresh=False):
 
         # If a treeinfo or discinfo file exists, it should be skipped.
         for r in repos_to_tree:
-            entry_name_list = []
             repo_name = r
             arch_tree = arches_to_tree.copy()
 
@@ -1198,10 +1179,6 @@ def tweak_treeinfo(self, repo, sync_root, arch):
             repos_to_tree = repo.split(',')
 
         for r in repos_to_tree:
-            entry_name_list = []
-            repo_name = r
-            arch_tree = arches_to_tree.copy()
-
             if r in self.iso_map['images']:
                 variants_to_tweak.append(r)
 
@@ -1232,7 +1209,6 @@ def tweak_treeinfo(self, repo, sync_root, arch):
                     self.log.error(Color.FAIL + 'There was an error writing os treeinfo.')
                     self.log.error(e)
 
-                #if self.fullrun:
                 ksimage = os.path.join(sync_root, v, a, 'kickstart')
                 ksdata = {
                         'arch': a,
@@ -1293,12 +1269,6 @@ def run_compose_closeout(self):
             )
             raise SystemExit()
 
-        log_root = os.path.join(
-                work_root,
-                "logs",
-                self.date_stamp
-        )
-
         iso_root = os.path.join(
                 work_root,
                 "isos"
@@ -1324,11 +1294,6 @@ def run_compose_closeout(self):
                 'images'
         )
 
-        global_work_root = os.path.join(
-                work_root,
-                "global",
-        )
-
         # Standard ISOs
         self.log.info(Color.INFO + 'Starting to sync ISOs to compose')
 
@@ -1537,8 +1502,7 @@ def run_upstream_repoclosure(self):
                         pod,
                         self.container
                 )
-                #print(podman_cmd_entry)
-                process = subprocess.call(
+                subprocess.call(
                         shlex.split(podman_cmd_entry),
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.DEVNULL
@@ -1549,7 +1513,7 @@ def run_upstream_repoclosure(self):
             self.log.info('Performing repoclosure on %s ... ' % repo)
             pod_watcher = f'{cmd} wait {join_all_pods}'
 
-            watch_man = subprocess.call(
+            subprocess.call(
                     shlex.split(pod_watcher),
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL
@@ -1571,7 +1535,7 @@ def run_upstream_repoclosure(self):
 
             rmcmd = f'{cmd} rm {join_all_pods}'
 
-            rmpod = subprocess.Popen(
+            subprocess.Popen(
                     rmcmd,
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL,
@@ -1658,7 +1622,6 @@ def __init__(
         self.gpgkey = sigvars['gpg_key']
         if 'repo_gpg_key' in sigvars:
             self.gpgkey = sigvars['gpg_key'] + sigvars['repo_gpg_key']
-        #self.arches = sigvars['allowed_arches']
         self.project_id = sigvars['project_id']
         if 'additional_dirs' in sigvars:
             self.additional_dirs = sigvars['additional_dirs']
@@ -1878,7 +1841,6 @@ def podman_sync(
         """
         cmd = Shared.podman_cmd(self.log)
         bad_exit_list = []
-        extra_dnf_args = ' '.join(self.extra_dnf_args.copy())
         reposync_delete = '--delete' if self.reposync_clean_old else ''
         self.log.info('Generating container entries')
         entries_dir = os.path.join(work_root, "entries")
@@ -2058,7 +2020,6 @@ def podman_sync(
             # Spawn up all podman processes for repo
             self.log.info(Color.INFO + 'Starting podman processes for %s ...' % r)
 
-            #print(entry_name_list)
             for pod in entry_name_list:
                 podman_cmd_entry = '{} run -d -it --security-opt label=disable -v "{}:{}" -v "{}:{}" -v "{}:{}" --name {} --entrypoint {}/{} {}'.format(
                         cmd,
@@ -2073,8 +2034,7 @@ def podman_sync(
                         pod,
                         self.container
                 )
-                #print(podman_cmd_entry)
-                process = subprocess.call(
+                subprocess.call(
                         shlex.split(podman_cmd_entry),
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.DEVNULL
@@ -2086,8 +2046,7 @@ def podman_sync(
             self.log.info(Color.INFO + 'Arches: ' + ' '.join(arch_sync))
             pod_watcher = f'{cmd} wait {join_all_pods}'
 
-            #print(pod_watcher)
-            watch_man = subprocess.call(
+            subprocess.call(
                     shlex.split(pod_watcher),
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL
@@ -2095,7 +2054,6 @@ def podman_sync(
 
             # After the above is done, we'll check each pod process for an exit
             # code.
-            pattern = "Exited (0)"
             for pod in entry_name_list:
                 checkcmd = f'{cmd} ps -f status=exited -f name={pod}'
                 podcheck = subprocess.Popen(
@@ -2112,7 +2070,7 @@ def podman_sync(
 
             rmcmd = f'{cmd} rm {join_all_pods}'
 
-            rmpod = subprocess.Popen(
+            subprocess.Popen(
                     rmcmd,
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL,
diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index 055f5aa..95c5f55 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -7,31 +7,14 @@
 import logging
 import sys
 import os
-import os.path
 import subprocess
 import shlex
 import time
 import tarfile
 import shutil
 
-# lazy person's s3 parser
-#import requests
-#import json
-#import xmltodict
-# if we can access s3
-#import boto3
-# relative_path, compute_file_checksums
-import kobo.shortcuts
 from fnmatch import fnmatch
 
-# This is for treeinfo
-from configparser import ConfigParser
-from productmd.common import SortedConfigParser
-from productmd.images import Image
-from productmd.extra_files import ExtraFiles
-import productmd.treeinfo
-# End treeinfo
-
 from jinja2 import Environment, FileSystemLoader
 
 from empanadas.common import Color, _rootdir
@@ -81,7 +64,6 @@ def __init__(
         self.compose_root = config['compose_root']
         self.compose_base = config['compose_root'] + "/" + major
         self.current_arch = config['arch']
-        #self.required_pkgs = rlvars['iso_map']['lorax']['required_pkgs']
         self.mock_work_root = config['mock_work_root']
         self.lorax_result_root = config['mock_work_root'] + "/" + "lorax"
         self.mock_isolation = isolation
@@ -139,9 +121,6 @@ def __init__(
         else:
             self.s3_bucket_url = config['bucket_url']
 
-        #if s3:
-        #    self.s3 = boto3.client('s3')
-
         # Templates
         file_loader = FileSystemLoader(f"{_rootdir}/templates")
         self.tmplenv = Environment(loader=file_loader)
@@ -157,21 +136,11 @@ def __init__(
                 "compose"
         )
 
-        self.compose_log_dir = os.path.join(
-                self.compose_latest_dir,
-                "work/logs"
-        )
-
         self.iso_work_dir = os.path.join(
                 self.compose_latest_dir,
                 "work/isos"
         )
 
-        self.live_work_dir = os.path.join(
-                self.compose_latest_dir,
-                "work/live"
-        )
-
         self.image_work_dir = os.path.join(
                 self.compose_latest_dir,
                 "work/images"
@@ -209,17 +178,8 @@ def __init__(
         self.log.info(self.revision_level)
 
     def run(self):
-        work_root = os.path.join(
-                self.compose_latest_dir,
-                'work'
-        )
         sync_root = self.compose_latest_sync
 
-        log_root = os.path.join(
-                work_root,
-                "logs"
-        )
-
         self.iso_build()
 
         self.log.info('Compose repo directory: %s' % sync_root)
@@ -336,10 +296,8 @@ def run_pull_lorax_artifacts(self):
         """
         # Determine if we're only managing one architecture out of all of them.
         # It does not hurt to do everything at once. But the option is there.
-        unpack_single_arch = False
         arches_to_unpack = self.arches
         if self.arch:
-            unpack_single_arch = True
             arches_to_unpack = [self.arch]
 
         self.log.info(Color.INFO + 'Determining the latest pulls...')
@@ -475,11 +433,6 @@ def _copy_lorax_to_variant(self, force_unpack, arch, image):
                 'lorax'
         )
 
-        iso_to_go = os.path.join(
-                self.iso_work_dir,
-                arch
-        )
-
         if not os.path.exists(os.path.join(src_to_image, '.treeinfo')):
             self.log.error(Color.FAIL + 'Lorax base image does not exist')
             return
@@ -662,14 +615,7 @@ def run_boot_sync(self):
         5. Modify (1) .treeinfo, keep out boot.iso checksum
         6. Create a .treeinfo for AppStream
         """
-        unpack_single_arch = False
-        arches_to_unpack = self.arches
-        if self.arch:
-            unpack_single_arch = True
-            arches_to_unpack = [self.arch]
-
         self._sync_boot(force_unpack=self.force_unpack, arch=self.arch, image=None)
-        #self._treeinfo_write(arch=self.arch)
 
     def _sync_boot(self, force_unpack, arch, image):
         """
@@ -757,15 +703,6 @@ def _extra_iso_build_wrap(self):
                 self.log.info(Color.WARN + f"Skipping compose repository scans for {y}")
                 reposcan = False
 
-            # Kind of hacky, but if we decide to have more than boot/dvd iso's,
-            # we need to make sure volname matches the initial lorax image,
-            # which the volid contains "dvd". AKA, file name doesn't always
-            # equate to volume ID
-            if 'volname' in self.iso_map['images'][y]:
-                volname = self.iso_map['images'][y]['volname']
-            else:
-                volname = y
-
             for a in arches_to_build:
                 lorax_path = os.path.join(self.lorax_work_dir, a, 'lorax', '.treeinfo')
                 image_path = os.path.join(self.lorax_work_dir, a, y, '.treeinfo')
@@ -997,7 +934,6 @@ def _extra_iso_podman_run(self, arches, images, work_root):
 
         for i in images:
             entry_name_list = []
-            image_name = i
             arch_sync = arches.copy()
 
             for a in arch_sync:
@@ -1050,7 +986,7 @@ def _extra_iso_podman_run(self, arches, images, work_root):
                         self.container
                 )
 
-                process = subprocess.call(
+                subprocess.call(
                         shlex.split(podman_cmd_entry),
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.DEVNULL
@@ -1061,7 +997,7 @@ def _extra_iso_podman_run(self, arches, images, work_root):
             self.log.info(Color.INFO + 'Building ' + i + ' ...')
             pod_watcher = f'{cmd} wait {join_all_pods}'
 
-            watch_man = subprocess.call(
+            subprocess.call(
                     shlex.split(pod_watcher),
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL
@@ -1069,7 +1005,6 @@ def _extra_iso_podman_run(self, arches, images, work_root):
 
             # After the above is done, we'll check each pod process for an exit
             # code.
-            pattern = "Exited (0)"
             for pod in entry_name_list:
                 checkcmd = f'{cmd} ps -f status=exited -f name={pod}'
                 podcheck = subprocess.Popen(
@@ -1086,7 +1021,7 @@ def _extra_iso_podman_run(self, arches, images, work_root):
 
             rmcmd = f'{cmd} rm {join_all_pods}'
 
-            rmpod = subprocess.Popen(
+            subprocess.Popen(
                     rmcmd,
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL,
@@ -1193,7 +1128,6 @@ def _generate_graft_points(
 
         try:
             with open(boot_manifest) as i:
-        #        ignores = set(line.lstrip("/").rstrip("\n") for line in i)
                 for line in i:
                     path = line.lstrip("/").rstrip("\n")
                     if path in updatable_files:
@@ -1212,8 +1146,7 @@ def _generate_graft_points(
                 update=updatables
         )
 
-        grafters = xorrs
-        return grafters
+        return xorrs
 
     def _get_grafts(self, paths, exclusive_paths=None, exclude=None):
         """
@@ -1282,12 +1215,10 @@ def _write_grafts(self, filepath, xorrspath, u, exclude=None, update=None):
                 replace = False
                 for upda in update:
                     if fnmatch(zm, upda):
-                        #print(f'updating: {zm} {upda}')
                         replace = True
                         break
                 for excl in exclude:
                     if fnmatch(zm, excl):
-                        #print(f'ignoring: {zm} {excl}')
                         found = True
                         break
                 if found:
@@ -1300,12 +1231,6 @@ def run_pull_iso_images(self):
         """
         Pulls ISO's made in v2
         """
-        arches_to_unpack = self.arches
-        latest_artifacts = {}
-        if self.arch:
-            unpack_single_arch = True
-            arches_to_unpack = [self.arch]
-
         print("not supported")
         sys.exit(1)
 
@@ -1315,11 +1240,9 @@ def run_pull_generic_images(self):
         to be. This relies on a list called "cloudimages" in the version
         configuration.
         """
-        unpack_single_arch = False
         arches_to_unpack = self.arches
         latest_artifacts = {}
         if self.arch:
-            unpack_single_arch = True
             arches_to_unpack = [self.arch]
 
         for name, extra in self.cloudimages['images'].items():
@@ -1369,7 +1292,6 @@ def run_pull_generic_images(self):
             del variantname
             del variants
 
-        #print(latest_artifacts)
         for keyname in latest_artifacts.keys():
             primary = latest_artifacts[keyname]['primary']
             filetype = latest_artifacts[keyname]['formattype']
@@ -1406,7 +1328,6 @@ def run_pull_generic_images(self):
                         fsuffix = drop_name.replace('layer', '')
                         drop_name = source_path.split('/')[-3] + fsuffix
 
-                    checksum_name = drop_name + '.CHECKSUM'
                     full_drop = f'{image_arch_dir}/{drop_name}'
 
                     checksum_drop = f'{image_arch_dir}/{drop_name}.CHECKSUM'
@@ -1553,7 +1474,6 @@ def __init__(
         self.compose_base = config['compose_root'] + "/" + major
         self.current_arch = config['arch']
         self.livemap = rlvars['livemap']
-        #self.required_pkgs = rlvars['livemap']['required_pkgs']
         self.mock_work_root = config['mock_work_root']
         self.live_result_root = config['mock_work_root'] + "/lmc"
         self.mock_isolation = isolation
@@ -1718,7 +1638,6 @@ def _live_iso_build_wrap(self):
                 raise SystemExit()
 
         if self.live_iso_mode == 'podman':
-            #self._live_iso_podman_run(self.current_arch, images_to_build, work_root)
             self.log.error(Color.FAIL + 'At this time, live images cannot be ' +
                     'built in podman.')
             raise SystemExit()
@@ -1857,7 +1776,6 @@ def _live_iso_podman_run(self, arch, images, work_root):
         self.log.warning(Color.WARN + 'There is no support for podman in empanadas.')
         self.log.warning(Color.WARN + "If this fails, it's on you to determine the fix.")
         for i in images:
-            image_name = i
             entry_name = f'buildLiveImage-{arch}-{i}.sh'
             entry_name_list.append(entry_name)
 
@@ -1879,7 +1797,7 @@ def _live_iso_podman_run(self, arch, images, work_root):
                     self.container
             )
 
-            process = subprocess.call(
+            subprocess.call(
                     shlex.split(podman_cmd_entry),
                     stdout=subprocess.DEVNULL,
                     stderr=subprocess.DEVNULL
@@ -1891,7 +1809,7 @@ def _live_iso_podman_run(self, arch, images, work_root):
 
         pod_watcher = f'{cmd} wait {join_all_pods}'
 
-        watch_man = subprocess.call(
+        subprocess.call(
                 shlex.split(pod_watcher),
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL
@@ -1899,7 +1817,6 @@ def _live_iso_podman_run(self, arch, images, work_root):
 
         # After the above is done, we'll check each pod process for an exit
         # code.
-        pattern = "Exited (0)"
         for pod in entry_name_list:
             checkcmd = f'{cmd} ps -f status=exited -f name={pod}'
             podcheck = subprocess.Popen(
@@ -1909,14 +1826,14 @@ def _live_iso_podman_run(self, arch, images, work_root):
                     shell=True
             )
 
-            output, errors = podcheck.communicate()
+            output, _ = podcheck.communicate()
             if 'Exited (0)' not in output.decode():
                 self.log.error(Color.FAIL + pod)
                 bad_exit_list.append(pod)
 
         rmcmd = f'{cmd} rm {join_all_pods}'
 
-        rmpod = subprocess.Popen(
+        subprocess.Popen(
                 rmcmd,
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL,
diff --git a/iso/empanadas/empanadas/util/shared.py b/iso/empanadas/empanadas/util/shared.py
index 0a67664..cb84f99 100644
--- a/iso/empanadas/empanadas/util/shared.py
+++ b/iso/empanadas/empanadas/util/shared.py
@@ -6,7 +6,6 @@
 import shlex
 import subprocess
 import shutil
-import tarfile
 import yaml
 import requests
 import boto3
@@ -141,7 +140,6 @@ def treeinfo_modify_write(data, imagemap, logger):
         the case of modifying treeinfo for primary repos or images.
         """
         arch = data['arch']
-        variant = data['variant']
         variant_path = data['variant_path']
         checksum = data['checksum']
         distname = data['distname']
@@ -160,7 +158,6 @@ def treeinfo_modify_write(data, imagemap, logger):
         treeinfo = os.path.join(image, '.treeinfo')
         discinfo = os.path.join(image, '.discinfo')
         mediarepo = os.path.join(image, 'media.repo')
-        #imagemap = self.iso_map['images'][variant]
         primary = imagemap['variant']
         repos = imagemap['repos']
         is_disc = False
@@ -211,7 +208,6 @@ def treeinfo_modify_write(data, imagemap, logger):
         # Fedora, ELN, and RHEL in general. This is the general structure,
         # apparently. But there could be a chance it'll change. We may need to
         # put in a configuration to deal with it at some point.
-        #ti.variants.variants.clear()
         for y in repos:
             if y in ti.variants.variants.keys():
                 vari = ti.variants.variants[y]
@@ -544,7 +540,6 @@ def rsync_method(src, dest):
         switches = '-vrlptDSHog --chown=10004:10005 --progress --human-readable --delete'
         rsync_command = f'{cmd} {switches} {src}/ {dest}'
 
-        #os.makedirs(dest, exist_ok=True)
         process = subprocess.call(
                 shlex.split(rsync_command),
                 stdout=subprocess.DEVNULL,
@@ -820,15 +815,9 @@ def get_mkisofs_cmd(
             use_xorrisofs=False,
             iso_level=None,
     ):
-        # I should hardcode this I think
-        #untranslated_filenames = True
         translation_table = True
-        #joliet = True
-        #joliet_long = True
-        #rock = True
         cmd = ["/usr/bin/xorrisofs" if use_xorrisofs else "/usr/bin/genisoimage"]
         if not os.path.exists(cmd[0]):
-            #logger.error('%s was not found. Good bye.' % cmd[0])
             raise SystemExit("\n\n" + cmd[0] + " was not found.\n\nPlease "
                     " ensure that you have installed the necessary packages on "
                     " this system. "
@@ -840,22 +829,18 @@ def get_mkisofs_cmd(
         if appid:
             cmd.extend(["-appid", appid])
 
-        #if untranslated_filenames:
         cmd.append("-untranslated-filenames")
 
         if volid:
             cmd.extend(["-volid", volid])
 
-        #if joliet:
         cmd.append("-J")
 
-        #if joliet_long:
         cmd.append("-joliet-long")
 
         if volset:
             cmd.extend(["-volset", volset])
 
-        #if rock:
         cmd.append("-rational-rock")
 
         if not use_xorrisofs and translation_table:
@@ -1082,8 +1067,6 @@ def deploy_extra_files(extra_files, sync_root, global_work_root, logger):
         might also deploy COMPOSE_ID and maybe in the future a metadata dir with
         a bunch of compose-esque stuff.
         """
-        #logger.info(Color.INFO + 'Deploying treeinfo, discinfo, and media.repo')
-
         cmd = Shared.git_cmd(logger)
         tmpclone = '/tmp/clone'
         extra_files_dir = os.path.join(
@@ -1107,7 +1090,7 @@ def deploy_extra_files(extra_files, sync_root, global_work_root, logger):
                 tmpclone
         )
 
-        git_clone = subprocess.call(
+        subprocess.call(
                 shlex.split(clonecmd),
                 stdout=subprocess.DEVNULL,
                 stderr=subprocess.DEVNULL
@@ -1173,10 +1156,8 @@ def norm_dnf_sync(data, repo, sync_root, work_root, arch, logger):
         This is for normal dnf syncs. This is very slow.
         """
         cmd = Shared.reposync_cmd(logger)
-        sync_single_arch = False
         arches_to_sync = data.arches
         if arch:
-            sync_single_arch = True
             arches_to_sync = [arch]
 
         logger.info(
@@ -1227,14 +1208,13 @@ def norm_dnf_sync(data, repo, sync_root, work_root, arch, logger):
                 )
 
                 logger.info('Syncing {} {}'.format(r, a))
-                #logger.info(sync_cmd)
                 # Try to figure out where to send the actual output of this...
                 # Also consider on running a try/except here? Basically if
                 # something happens (like a repo doesn't exist for some arch,
                 # eg RT for aarch64), make a note of it somehow (but don't
                 # break the entire sync). As it stands with this
                 # implementation, if something fails, it just continues on.
-                process = subprocess.call(
+                subprocess.call(
                         shlex.split(sync_cmd),
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.DEVNULL
@@ -1242,7 +1222,7 @@ def norm_dnf_sync(data, repo, sync_root, work_root, arch, logger):
 
                 if not data.ignore_debug:
                     logger.info('Syncing {} {} (debug)'.format(r, a))
-                    process_debug = subprocess.call(
+                    subprocess.call(
                             shlex.split(debug_sync_cmd),
                             stdout=subprocess.DEVNULL,
                             stderr=subprocess.DEVNULL
@@ -1267,7 +1247,7 @@ def norm_dnf_sync(data, repo, sync_root, work_root, arch, logger):
 
 
                 logger.info('Syncing {} source'.format(r))
-                process_source = subprocess.call(
+                subprocess.call(
                         shlex.split(source_sync_cmd),
                         stdout=subprocess.DEVNULL,
                         stderr=subprocess.DEVNULL
diff --git a/mangle/generators/prepopulate_parser.py b/mangle/generators/prepopulate_parser.py
index 2bde15c..492e2b5 100755
--- a/mangle/generators/prepopulate_parser.py
+++ b/mangle/generators/prepopulate_parser.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import os
-import os.path
 import json
 import argparse
 import dnf
diff --git a/mangle/generators/version_metadata_parser.py b/mangle/generators/version_metadata_parser.py
index 9c166c1..bf23f07 100644
--- a/mangle/generators/version_metadata_parser.py
+++ b/mangle/generators/version_metadata_parser.py
@@ -1,6 +1,5 @@
 #!/usr/bin/python3
 import os
-import os.path
 import json
 import dnf
 
diff --git a/mangle/generators/version_parser.py b/mangle/generators/version_parser.py
index bfed115..7b60eea 100755
--- a/mangle/generators/version_parser.py
+++ b/mangle/generators/version_parser.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python3
 import os
-import os.path
 import json
 import argparse
 import dnf

From cb7f1188a82d87b34019b6aa29fa14f333415b24 Mon Sep 17 00:00:00 2001
From: Trinity Quirk <tquirk@ciq.com>
Date: Tue, 4 Feb 2025 12:18:29 -0800
Subject: [PATCH 2/5] empanadas: Normalize file writing to use with blocks

We found some explicit `close()` calls when writing files in a `with`
block, which is not necessary.  Files are closed when exiting the block,
either by normal execution or by exception.

We also convert a few instances of file writes *not* using `with`
blocks, to use the appropriate `with` syntax.
---
 iso/empanadas/empanadas/util/dnf_utils.py | 49 +++++++----------------
 iso/empanadas/empanadas/util/iso_utils.py | 24 -----------
 iso/empanadas/empanadas/util/shared.py    | 13 +-----
 3 files changed, 16 insertions(+), 70 deletions(-)

diff --git a/iso/empanadas/empanadas/util/dnf_utils.py b/iso/empanadas/empanadas/util/dnf_utils.py
index 4cc79d4..ae0667a 100644
--- a/iso/empanadas/empanadas/util/dnf_utils.py
+++ b/iso/empanadas/empanadas/util/dnf_utils.py
@@ -458,14 +458,11 @@ def podman_sync(
                         download_path=debug_sync_path
                 )
 
-                entry_point_open = open(entry_point_sh, "w+")
-                debug_entry_point_open = open(debug_entry_point_sh, "w+")
+                with open(entry_point_sh, "w+") as entry_point:
+                    entry_point.write(sync_output)
 
-                entry_point_open.write(sync_output)
-                debug_entry_point_open.write(debug_sync_output)
-
-                entry_point_open.close()
-                debug_entry_point_open.close()
+                with open(debug_entry_point_sh, "w+") as debug_entry_point:
+                    debug_entry_point.write(debug_sync_output)
 
                 os.chmod(entry_point_sh, 0o755)
                 os.chmod(debug_entry_point_sh, 0o755)
@@ -507,9 +504,8 @@ def podman_sync(
                             metadata_cmd=ks_metadata_cmd,
                             sync_log=ks_sync_log
                     )
-                    ks_entry_point_open = open(ks_point_sh, "w+")
-                    ks_entry_point_open.write(ks_sync_output)
-                    ks_entry_point_open.close()
+                    with open(ks_point_sh, "w+") as ks_entry_point:
+                        ks_entry_point.write(ks_sync_output)
                     os.chmod(ks_point_sh, 0o755)
 
             # We ignoring sources?
@@ -548,9 +544,8 @@ def podman_sync(
                         sync_log=source_sync_log
                 )
 
-                source_entry_point_open = open(source_entry_point_sh, "w+")
-                source_entry_point_open.write(source_sync_output)
-                source_entry_point_open.close()
+                with open(source_entry_point_sh, "w+") as source_entry_point:
+                    source_entry_point.write(source_sync_output)
                 os.chmod(source_entry_point_sh, 0o755)
 
             # Spawn up all podman processes for repo
@@ -704,7 +699,6 @@ def repoclosure_work(self, sync_root, work_root, log_root):
                     rcep.write('/usr/bin/dnf install dnf-plugins-core -y\n')
                     rcep.write('/usr/bin/dnf clean all\n')
                     rcep.write(repoclosure_cmd + '\n')
-                    rcep.close()
 
                 os.chmod(repoclosure_entry_point_sh, 0o755)
                 repo_combination.clear()
@@ -797,7 +791,6 @@ def deploy_metadata(self, sync_root):
 
         with open(metadata_dir + '/COMPOSE_ID', "w+") as f:
             f.write(self.compose_id)
-            f.close()
 
         Shared.write_metadata(
                 self.timestamp,
@@ -832,7 +825,6 @@ def deploy_metadata(self, sync_root):
 
         with open(metadata_dir + '/README', 'w+', encoding='utf-8') as readme_file:
             readme_file.write(readme_output)
-            readme_file.close()
 
 
     def deploy_treeinfo(self, repo, sync_root, arch, refresh=False):
@@ -1355,8 +1347,6 @@ def run_compose_closeout(self):
                         with open(check, 'r', encoding='utf-8') as sum:
                             for line in sum:
                                 fp.write(line)
-                            sum.close()
-                    fp.close()
 
             live_arch_root = os.path.join(sync_live_root, arch)
             live_arch_checksum = os.path.join(live_arch_root, 'CHECKSUM')
@@ -1366,8 +1356,6 @@ def run_compose_closeout(self):
                         with open(lcheck, 'r', encoding='utf-8') as sum:
                             for line in sum:
                                 lp.write(line)
-                            sum.close()
-                    lp.close()
 
             images_arch_root = os.path.join(sync_images_root, arch)
             images_arch_checksum = os.path.join(images_arch_root, 'CHECKSUM')
@@ -1377,8 +1365,6 @@ def run_compose_closeout(self):
                         with open(icheck, 'r', encoding='utf-8') as sum:
                             for line in sum:
                                 ip.write(line)
-                            sum.close()
-                    ip.close()
 
         # Deploy final metadata for a close out
         self.deploy_metadata(sync_root)
@@ -1483,7 +1469,6 @@ def run_upstream_repoclosure(self):
                     rcep.write('/usr/bin/dnf install dnf-plugins-core -y\n')
                     rcep.write('/usr/bin/dnf clean all\n')
                     rcep.write(repoclosure_cmd + '\n')
-                    rcep.close()
                 os.chmod(repoclosure_entry_point_sh, 0o755)
                 repo_combination.clear()
 
@@ -1952,14 +1937,10 @@ def podman_sync(
                         deploy_extra_files=True
                 )
 
-                entry_point_open = open(entry_point_sh, "w+")
-                debug_entry_point_open = open(debug_entry_point_sh, "w+")
-
-                entry_point_open.write(sync_output)
-                debug_entry_point_open.write(debug_sync_output)
-
-                entry_point_open.close()
-                debug_entry_point_open.close()
+                with open(entry_point_sh, "w+") as entry_point:
+                    entry_point.write(sync_output)
+                with open(debug_entry_point_sh, "w+") as debug_entry_point:
+                    debug_entry_point.write(debug_sync_output)
 
                 os.chmod(entry_point_sh, 0o755)
                 os.chmod(debug_entry_point_sh, 0o755)
@@ -2012,9 +1993,8 @@ def podman_sync(
                         deploy_extra_files=True
                 )
 
-                source_entry_point_open = open(source_entry_point_sh, "w+")
-                source_entry_point_open.write(source_sync_output)
-                source_entry_point_open.close()
+                with open(source_entry_point_sh, "w+") as source_entry_point:
+                    source_entry_point.write(source_sync_output)
                 os.chmod(source_entry_point_sh, 0o755)
 
             # Spawn up all podman processes for repo
@@ -2115,7 +2095,6 @@ def deploy_metadata(self, sync_root):
 
         with open(metadata_dir + '/COMPOSE_ID', "w+") as f:
             f.write(self.compose_id)
-            f.close()
 
         Shared.write_metadata(
                 self.timestamp,
diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index 95c5f55..ca22baa 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -263,15 +263,12 @@ def generate_iso_scripts(self):
 
         with open(mock_iso_path, "w+") as mock_iso_entry:
             mock_iso_entry.write(mock_iso_template_output)
-            mock_iso_entry.close()
 
         with open(mock_sh_path, "w+") as mock_sh_entry:
             mock_sh_entry.write(mock_sh_template_output)
-            mock_sh_entry.close()
 
         with open(iso_template_path, "w+") as iso_template_entry:
             iso_template_entry.write(iso_template_output)
-            iso_template_entry.close()
 
         os.chmod(mock_sh_path, 0o755)
         os.chmod(iso_template_path, 0o755)
@@ -421,7 +418,6 @@ def _unpack_artifacts(self, force_unpack, arch, tarball):
         self.log.info('Unpacking %s' % tarball)
         with tarfile.open(tarball) as t:
             Shared.tar_safe_extractall(t, unpack_dir)
-            t.close()
 
     def _copy_lorax_to_variant(self, force_unpack, arch, image):
         """
@@ -526,7 +522,6 @@ def _copy_boot_to_work(self, force_unpack, arch):
             return
         with open(isobootpath + '.CHECKSUM', "w+") as c:
             c.write(checksum)
-            c.close()
 
         # For Rocky-ARCH-boot.iso
         linksum = Shared.get_checksum(linkbootpath, self.checksum, self.log)
@@ -535,7 +530,6 @@ def _copy_boot_to_work(self, force_unpack, arch):
             return
         with open(linkbootpath + '.CHECKSUM', "w+") as l:
             l.write(linksum)
-            l.close()
 
         # For Rocky-X-latest-ARCH-boot.iso
         latestlinksum = Shared.get_checksum(latestlinkbootpath, self.checksum, self.log)
@@ -544,7 +538,6 @@ def _copy_boot_to_work(self, force_unpack, arch):
             return
         with open(latestlinkbootpath + '.CHECKSUM', "w+") as l:
             l.write(latestlinksum)
-            l.close()
 
     def _copy_nondisc_to_repo(self, force_unpack, arch, repo):
         """
@@ -839,7 +832,6 @@ def _extra_iso_local_config(self, arch, image, grafts, work_root):
         # Generate a xorriso compatible dialog
         with open(grafts) as xp:
             xorpoint = xp.read()
-            xp.close()
         xorriso_template_output = xorriso_template.render(
                 boot_iso=boot_iso,
                 isoname=isoname,
@@ -849,7 +841,6 @@ def _extra_iso_local_config(self, arch, image, grafts, work_root):
         )
         with open(xorriso_template_path, "w+") as xorriso_template_entry:
             xorriso_template_entry.write(xorriso_template_output)
-            xorriso_template_entry.close()
         opts['graft_points'] = xorriso_template_path
 
         make_image = '{} {}'.format(
@@ -878,19 +869,15 @@ def _extra_iso_local_config(self, arch, image, grafts, work_root):
 
         with open(mock_iso_path, "w+") as mock_iso_entry:
             mock_iso_entry.write(mock_iso_template_output)
-            mock_iso_entry.close()
 
         with open(mock_sh_path, "w+") as mock_sh_entry:
             mock_sh_entry.write(mock_sh_template_output)
-            mock_sh_entry.close()
 
         with open(iso_template_path, "w+") as iso_template_entry:
             iso_template_entry.write(iso_template_output)
-            iso_template_entry.close()
 
         with open(iso_readme_path, "w+") as iso_readme_entry:
             iso_readme_entry.write(iso_readme_template_output)
-            iso_readme_entry.close()
 
         os.chmod(mock_sh_path, 0o755)
         os.chmod(iso_template_path, 0o755)
@@ -1038,7 +1025,6 @@ def _extra_iso_podman_run(self, arches, images, work_root):
                         self.log.error(Color.FAIL + path + ' not found! Are you sure it was built?')
                     with open(path + '.CHECKSUM', "w+") as c:
                         c.write(checksum)
-                        c.close()
 
             self.log.info(Color.INFO + 'Building ' + i + ' completed')
 
@@ -1225,7 +1211,6 @@ def _write_grafts(self, filepath, xorrspath, u, exclude=None, update=None):
                     continue
                 mcmd = "-update" if replace else "-map"
                 fx.write("%s %s %s\n" % (mcmd, u[zm], zm))
-            fx.close()
 
     def run_pull_iso_images(self):
         """
@@ -1360,7 +1345,6 @@ def run_pull_generic_images(self):
                         continue
                     with open(checksum_drop, 'w+') as c:
                         c.write(checksum)
-                        c.close()
 
                     self.log.info('Creating a symlink to latest image...')
                     latest_name = '{}/{}-{}-{}.latest.{}.{}'.format(
@@ -1396,7 +1380,6 @@ def run_pull_generic_images(self):
 
                     with open(latest_checksum, 'w+') as link:
                         link.write(checkdata)
-                        link.close()
 
                     # If this is the primary image, set the appropriate symlink
                     # and checksum
@@ -1430,7 +1413,6 @@ def run_pull_generic_images(self):
                         checkpdata = checkpdata.replace(drop_name, latest_primary_path)
                         with open(latest_primary_checksum, 'w+') as link:
                             link.write(checkpdata)
-                            link.close()
 
         self.log.info(Color.INFO + 'Image download phase completed')
 
@@ -1743,15 +1725,12 @@ def _live_iso_local_config(self, image, work_root):
 
         with open(mock_iso_path, "w+") as mip:
             mip.write(mock_iso_template_output)
-            mip.close()
 
         with open(mock_sh_path, "w+") as msp:
             msp.write(mock_sh_template_output)
-            msp.close()
 
         with open(iso_template_path, "w+") as itp:
             itp.write(iso_template_output)
-            itp.close()
 
         os.chmod(mock_sh_path, 0o755)
         os.chmod(iso_template_path, 0o755)
@@ -1850,7 +1829,6 @@ def _live_iso_podman_run(self, arch, images, work_root):
                     self.log.error(Color.FAIL + path + ' not found! Are you sure it was built?')
                 with open(path + '.CHECKSUM', "w+") as c:
                     c.write(checksum)
-                    c.close()
 
         self.log.info(Color.INFO + 'Building live images completed')
 
@@ -1924,7 +1902,6 @@ def _live_iso_local_run(self, arch, image, work_root):
                 return
             with open(dest_path + '.CHECKSUM', "w+") as c:
                 c.write(checksum)
-                c.close()
 
             linksum = Shared.get_checksum(link_path, self.checksum, self.log)
             if not linksum:
@@ -1932,4 +1909,3 @@ def _live_iso_local_run(self, arch, image, work_root):
                 return
             with open(link_path + '.CHECKSUM', "w+") as c:
                 c.write(linksum)
-                c.close()
diff --git a/iso/empanadas/empanadas/util/shared.py b/iso/empanadas/empanadas/util/shared.py
index cb84f99..0cfddc4 100644
--- a/iso/empanadas/empanadas/util/shared.py
+++ b/iso/empanadas/empanadas/util/shared.py
@@ -82,7 +82,6 @@ def get_checksum(path, hashtype, logger):
                         break
                     checksum.update(chunk)
 
-                input_file.close()
         except IOError as exc:
             logger.error("Could not open file %s: %s", path, exc)
             return False
@@ -274,11 +273,9 @@ def write_metadata(
 
         with open(file_path + ".json", "w+") as fp:
             json.dump(metadata, fp, indent=4)
-            fp.close()
 
         with open(file_path + ".yaml", "w+") as yp:
             yaml.dump(metadata, yp)
-            yp.close()
 
     @staticmethod
     def discinfo_write(timestamp, fullname, arch, file_path):
@@ -295,7 +292,6 @@ def discinfo_write(timestamp, fullname, arch, file_path):
 
         with open(file_path, "w+") as f:
             f.write("\n".join(data))
-            f.close()
 
     @staticmethod
     def media_repo_write(timestamp, fullname, file_path):
@@ -479,7 +475,6 @@ def generate_conf(
         # create dest_path
         if not os.path.exists(dest_path):
             os.makedirs(dest_path, exist_ok=True)
-        config_file = open(fname, "w+")
 
         repolist = []
         for repo in repos:
@@ -525,9 +520,9 @@ def generate_conf(
                 gpg_check=gpg_check,
                 repo_gpg_check=repo_gpg_check
         )
-        config_file.write(output)
+        with open(fname, "w+") as config_file:
+            config_file.write(output)
 
-        config_file.close()
         return fname
 
     @staticmethod
@@ -713,8 +708,6 @@ def reqs_download_artifacts(force_download, s3_bucket_url, source, dest, logger)
             with requests.get(unurl, allow_redirects=True) as r:
                 with open(dest, 'wb') as f:
                     f.write(r.content)
-                    f.close()
-                r.close()
         except requests.exceptions.RequestException as e:
             logger.error('There was a problem downloading the artifact')
             raise SystemExit(e)
@@ -1036,11 +1029,9 @@ def composeinfo_write(
 
         with open(cijson, 'r') as cidump:
             jsonData = json.load(cidump)
-            cidump.close()
 
         with open(ciyaml, 'w+') as ymdump:
             yaml.dump(jsonData, ymdump)
-            ymdump.close()
 
     @staticmethod
     def symlink_to_latest(shortname, major_version, generated_dir, compose_latest_dir, logger):

From b067bdabb3ab021a3c87847f06f35c682645c0b4 Mon Sep 17 00:00:00 2001
From: Trinity Quirk <tquirk@ciq.com>
Date: Wed, 12 Mar 2025 16:56:58 -0700
Subject: [PATCH 3/5] IsoBuild: Remove unused build_sync

The methods don't actually do anything, and are not called from
anywhere.
---
 iso/empanadas/empanadas/util/iso_utils.py | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index ca22baa..5f036d5 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -595,28 +595,6 @@ def _copy_nondisc_to_repo(self, force_unpack, arch, repo):
         except:
             self.log.error('%s already exists??' % repo)
 
-
-    def run_boot_sync(self):
-        """
-        This unpacks into BaseOS/$arch/os, assuming there's no data actually
-        there. There should be checks.
-
-        1. Sync from work/lorax/$arch to work/lorax/$arch/dvd
-        2. Sync from work/lorax/$arch to work/lorax/$arch/minimal
-        3. Sync from work/lorax/$arch to BaseOS/$arch/os
-        4. Modify (3) .treeinfo
-        5. Modify (1) .treeinfo, keep out boot.iso checksum
-        6. Create a .treeinfo for AppStream
-        """
-        self._sync_boot(force_unpack=self.force_unpack, arch=self.arch, image=None)
-
-    def _sync_boot(self, force_unpack, arch, image):
-        """
-        Syncs whatever
-        """
-        self.log.info('Copying lorax to %s directory...' % image)
-        # checks here, report that it already exists
-
     def _treeinfo_wrapper(self, arch, variant):
         """
         Ensure treeinfo and discinfo is written correctly based on the variant

From 5c93e6a9d7277af78bf3b651af9280d16c77e836 Mon Sep 17 00:00:00 2001
From: Trinity Quirk <tquirk@ciq.com>
Date: Fri, 7 Feb 2025 10:06:37 -0800
Subject: [PATCH 4/5] IsoBuild: Remove unused function parameter in graft
 writer

The `filepath` parameter was no longer used; it seems like the
`xorrspath` has superseded it, but the first was never removed.  It also
allows us to eliminate an unused variable in the calling method.
---
 iso/empanadas/empanadas/util/iso_utils.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index 5f036d5..9f6211f 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -1074,8 +1074,6 @@ def _generate_graft_points(
                 for k, v in self._get_grafts([rd_for_var]).items():
                     files[os.path.join(repo, "repodata", k)] = v
 
-        grafts = f'{lorax_base_dir}/{iso}-{arch}-grafts'
-
         xorrs = f'{lorax_base_dir}/xorriso-{iso}-{arch}.txt'
 
         # Generate exclusion list/dict from boot.iso manifest
@@ -1103,7 +1101,6 @@ def _generate_graft_points(
             raise SystemExit(e)
 
         self._write_grafts(
-                grafts,
                 xorrs,
                 files,
                 exclude=ignores,
@@ -1142,7 +1139,7 @@ def _get_grafts(self, paths, exclusive_paths=None, exclude=None):
 
         return result
 
-    def _write_grafts(self, filepath, xorrspath, u, exclude=None, update=None):
+    def _write_grafts(self, xorrspath, u, exclude=None, update=None):
         """
         Write out the graft points
         """

From 2743e37341a09aa2a314afc5d8a7795c7515bf0a Mon Sep 17 00:00:00 2001
From: Trinity Quirk <tquirk@ciq.com>
Date: Thu, 6 Feb 2025 11:57:11 -0800
Subject: [PATCH 5/5] empanadas: Eliminate user agent template hack

Jinja's official method for including template-like strings within
templates is to use variable blocks with quoted strings inside.  We will
eliminate the need for callers to provide something which the mock
template can provide on its own.
---
 iso/empanadas/empanadas/templates/isomock.tmpl.cfg | 2 +-
 iso/empanadas/empanadas/util/iso_utils.py          | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/iso/empanadas/empanadas/templates/isomock.tmpl.cfg b/iso/empanadas/empanadas/templates/isomock.tmpl.cfg
index 5b4f528..caa10f6 100644
--- a/iso/empanadas/empanadas/templates/isomock.tmpl.cfg
+++ b/iso/empanadas/empanadas/templates/isomock.tmpl.cfg
@@ -35,7 +35,7 @@ best=1
 install_weak_deps=0
 protected_packages=
 module_platform_id=platform:{{ dist }}
-user_agent={{ user_agent }}
+user_agent={{ '{{' }} user_agent {{ '}}' }}
 
 {% for repo in repos %}
 [{{ repo.name }}]
diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py
index 9f6211f..6ee697a 100644
--- a/iso/empanadas/empanadas/util/iso_utils.py
+++ b/iso/empanadas/empanadas/util/iso_utils.py
@@ -229,7 +229,6 @@ def generate_iso_scripts(self):
                 required_pkgs=required_pkgs,
                 dist=self.disttag,
                 repos=self.repolist,
-                user_agent='{{ user_agent }}',
                 compose_dir_is_here=self.compose_dir_is_here,
                 compose_dir=self.compose_root,
         )
@@ -780,7 +779,6 @@ def _extra_iso_local_config(self, arch, image, grafts, work_root):
                 required_pkgs=required_pkgs,
                 dist=self.disttag,
                 repos=self.repolist,
-                user_agent='{{ user_agent }}',
                 compose_dir_is_here=True,
                 compose_dir=self.compose_root,
         )
@@ -1669,7 +1667,6 @@ def _live_iso_local_config(self, image, work_root):
                 dist=self.disttag,
                 repos=self.repolist,
                 compose_dir_is_here=True,
-                user_agent='{{ user_agent }}',
                 compose_dir=self.compose_root,
         )