sshtepa/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Pull Requests Activity

re-add replacement steps

Browse Source
This commit is contained in:
Louis Abel 2023-03-29 00:19:23 -07:00
parent 36443b5d8d
commit 8a95c3f64e
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

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