sig_core/toolkit
sig_core/toolkit
7
2
Fork 3
Code Issues 6 Pull Requests 2 Actions Projects Releases Wiki Activity

add debug message

Browse Source
This commit is contained in:
Louis Abel 2023-03-29 00:02:37 -07:00
parent 4b206f9e8f
commit 36443b5d8d
Signed by: label
GPG Key ID: B37E62D143879B36
1 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
iso/empanadas/empanadas/util/iso_utils.py
View File

@ -1166,17 +1166,18 @@ class IsoBuild:
# below is a pungi "buildinstall" thing that we don't do, but may # below is a pungi "buildinstall" thing that we don't do, but may
# include as a feature if it ever happens. # include as a feature if it ever happens.
updatable_files = set(ArchCheck.boot_configs + ArchCheck.boot_images + ['.discinfo']) updatable_files = set(ArchCheck.boot_configs + ArchCheck.boot_images + ['.discinfo'])
ignores = set() #ignores = set()
updatables = set() updatables = set()
try: try:
with open(boot_manifest) as i: with open(boot_manifest) as i:
for line in i: ignores = set(line.lstrip("/").rstrip("\n") for line in i)
path = line.lstrip("/").rstrip("\n") # for line in i:
if path in updatable_files: # path = line.lstrip("/").rstrip("\n")
updatables.add(path) # if path in updatable_files:
else: # updatables.add(path)
ignores.add(path) # else:
# ignores.add(path)
except Exception as e: except Exception as e:
self.log.error(Color.FAIL + 'File was likely not found.') self.log.error(Color.FAIL + 'File was likely not found.')
raise SystemExit(e) raise SystemExit(e)
@ -1265,14 +1266,15 @@ class IsoBuild:
for zm in sorted(result, key=self._sorting): for zm in sorted(result, key=self._sorting):
found = False found = False
replace = False replace = False
for upda in update: #for upda in update:
#if fnmatch(zm, upda): # if fnmatch(zm, upda):
if upda in zm: # #if upda in zm:
replace = True # replace = True
break # break
for excl in exclude: for excl in exclude:
#if fnmatch(zm, excl): if fnmatch(zm, excl):
if excl in zm: #if excl in zm:
print(f'ignoring: {zm} {excl}')
found = True found = True
break break
if found: if found: