lumarel/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Finish and resolve RLBT#0000134

Browse Source
This commit is contained in:
Louis Abel 2022-07-04 12:36:15 -07:00
parent 340a6a3377
commit b89ebe777a
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
1 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
iso/empanadas/empanadas/util/dnf_utils.py
View File

@ -1356,6 +1356,11 @@ class RepoSync:
"live" "live"
) )
sync_live_root = os.path.join(
sync_root,
'live'
)
global_work_root = os.path.join( global_work_root = os.path.join(
work_root, work_root,
"global", "global",
@ -1397,9 +1402,9 @@ class RepoSync:
) )
if os.path.exists('/usr/bin/fpsync'): if os.path.exists('/usr/bin/fpsync'):
message, ret = Shared.fpsync_method(iso_root, sync_iso_root, tmp_dir) message, ret = Shared.fpsync_method(live_root, sync_live_root, tmp_dir)
elif os.path.exists('/usr/bin/parallel') and os.path.exists('/usr/bin/rsync'): elif os.path.exists('/usr/bin/parallel') and os.path.exists('/usr/bin/rsync'):
message, ret = Shared.rsync_method(iso_root, sync_iso_root) message, ret = Shared.rsync_method(live_root, sync_live_root)
if ret != 0: if ret != 0:
self.log.error( self.log.error(
@ -1421,8 +1426,20 @@ class RepoSync:
with open(check, 'r', encoding='utf-8') as sum: with open(check, 'r', encoding='utf-8') as sum:
for line in sum: for line in sum:
fp.write(line) fp.write(line)
sum.close()
fp.close() fp.close()
if arch == 'x86_64' and os.path.exists(sync_live_root):
live_arch_root = os.path.join(sync_live_root, arch)
live_arch_checksum = os.path.join(live_arch_root, 'CHECKSUM')
with open(live_arch_checksum, 'w+', encoding='utf-8') as lp:
for lcheck in glob.iglob(iso_arch_root + '/*.CHECKSUM'):
with open(lcheck, 'r', encoding='utf-8') as sum:
for line in sum:
lp.write(line)
sum.close()
lp.close()
# Deploy final metadata for a close out # Deploy final metadata for a close out
self.deploy_metadata(sync_root) self.deploy_metadata(sync_root)