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

comment out excludes for genisoimage, remove comments

Browse Source
This commit is contained in:
Louis Abel 2023-03-29 00:48:08 -07:00
parent 8a95c3f64e
commit f022ed15d4
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

@ -1256,11 +1256,8 @@ class IsoBuild:
result[zl] = u[zl] result[zl] = u[zl]
seen.add(dirn) seen.add(dirn)
# Note to self, we need to add a "/" to the list of files # We check first if a file needs to be updated first before relying on
# that we're either updating or ignoring.. # the boot.iso manifest to exclude a file
# also we need to add the update logic to the classic.
#exclude_list = [os.path.join('/', exc) for exc in exclude]
#update_list = [os.path.join('/', upd) for upd in update]
if self.iso_map['xorrisofs']: if self.iso_map['xorrisofs']:
fx = open(xorrspath, "w") fx = open(xorrspath, "w")
for zm in sorted(result, key=self._sorting): for zm in sorted(result, key=self._sorting):
@ -1268,12 +1265,12 @@ class IsoBuild:
replace = False replace = False
for upda in update: for upda in update:
if fnmatch(zm, upda): if fnmatch(zm, upda):
print(f'updating: {zm} {upda}') #print(f'updating: {zm} {upda}')
replace = True replace = True
break break
for excl in exclude: for excl in exclude:
if fnmatch(zm, excl): if fnmatch(zm, excl):
print(f'ignoring: {zm} {excl}') #print(f'ignoring: {zm} {excl}')
found = True found = True
break break
if found: if found:
@ -1283,14 +1280,16 @@ class IsoBuild:
fx.close() fx.close()
else: else:
fh = open(filepath, "w") fh = open(filepath, "w")
self.log.info(Color.WARN + 'Nothing should be excluded in legacy ' +
'genisoimage. Ignoring exclude list.')
for zl in sorted(result, key=self._sorting): for zl in sorted(result, key=self._sorting):
found = False #found = False
for excl in exclude: #for excl in exclude:
if fnmatch(zl, excl): # if fnmatch(zl, excl):
found = True # found = True
break # break
if found: #if found:
continue # continue
fh.write("%s=%s\n" % (zl, u[zl])) fh.write("%s=%s\n" % (zl, u[zl]))
fh.close() fh.close()