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

stop using fnmatch for updates and excludes

Browse Source
This commit is contained in:
Louis Abel 2023-03-28 23:18:24 -07:00
parent 75861c9efd
commit 164d73e70d
Signed by: label
GPG Key ID: B37E62D143879B36
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1174,9 +1174,9 @@ class IsoBuild:
for line in i: for line in i:
path = line.lstrip("/").rstrip("\n") path = line.lstrip("/").rstrip("\n")
if path in updatable_files: if path in updatable_files:
updatables.add("*/" +path) updatables.add(path)
else: else:
ignores.add("*/" + path) 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)
@ -1266,11 +1266,13 @@ class IsoBuild:
found = False found = False
replace = False replace = False
for excl in exclude: for excl in exclude:
if fnmatch(zm, excl): #if fnmatch(zm, excl):
if excl in zm:
found = True found = True
break break
for upda in update: for upda in update:
if fnmatch(zm, upda): #if fnmatch(zm, upda):
if upda in zm:
replace = True replace = True
break break
if found: if found: