almalinux/pungi
14
1
Fork 0
Code Issues Pull Requests Releases Activity

Fix shadowed variable

Browse Source 
This could result in incorrect log messages being printed.

Signed-off-by: Lubomír Sedlář <lsedlar@redhat.com>
This commit is contained in:
Lubomír Sedlář 2019-07-24 13:45:27 +02:00
parent 27d015543f
commit e9a363bfde
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pungi/phases/createrepo.py
View File

@ -289,13 +289,15 @@ def get_productids_from_scm(compose):
# use for development: # use for development:
# pem_files = glob.glob("%s/*.pem" % tmp_dir)[-1:] # pem_files = glob.glob("%s/*.pem" % tmp_dir)[-1:]
if not pem_files: if not pem_files:
msg = "No product certificate found (arch: %s, variant: %s)" % (arch, variant.uid) warning = "No product certificate found (arch: %s, variant: %s)" % (
arch, variant.uid
)
if product_id_allow_missing: if product_id_allow_missing:
compose.log_warning(msg) compose.log_warning(warning)
continue continue
else: else:
shutil.rmtree(tmp_dir) shutil.rmtree(tmp_dir)
raise RuntimeError(msg) raise RuntimeError(warning)
if len(pem_files) > 1: if len(pem_files) > 1:
shutil.rmtree(tmp_dir) shutil.rmtree(tmp_dir)
raise RuntimeError("Multiple product certificates found (arch: %s, variant: %s): %s" % (arch, variant.uid, ", ".join(sorted([os.path.basename(i) for i in pem_files])))) raise RuntimeError("Multiple product certificates found (arch: %s, variant: %s): %s" % (arch, variant.uid, ", ".join(sorted([os.path.basename(i) for i in pem_files]))))