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

force arch

Browse Source
This commit is contained in:
Louis Abel 2022-05-27 06:59:27 -07:00
parent 55870075ac
commit e49a69ceea
Signed by: label
GPG Key ID: B37E62D143879B36
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
iso/py/util/dnf_utils.py
View File

@ -428,10 +428,18 @@ class RepoSync:
'debug/tree' 'debug/tree'
) )
sync_cmd = ("/usr/bin/dnf reposync -c {} --download-metadata " arch_force_cp = ("/usr/bin/sed 's|$basearch|{}|g' {} > {}.{}".format(
a,
self.dnf_config,
self.dnf_config,
a
))
sync_cmd = ("/usr/bin/dnf reposync -c {}.{} --download-metadata "
"--repoid={} -p {} --forcearch {} --norepopath 2>&1 " "--repoid={} -p {} --forcearch {} --norepopath 2>&1 "
"| tee -a {}/{}-{}-{}.log").format( "| tee -a {}/{}-{}-{}.log").format(
self.dnf_config, self.dnf_config,
a,
r, r,
os_sync_path, os_sync_path,
a, a,
@ -441,10 +449,11 @@ class RepoSync:
self.date_stamp self.date_stamp
) )
debug_sync_cmd = ("/usr/bin/dnf reposync -c {} " debug_sync_cmd = ("/usr/bin/dnf reposync -c {}.{} "
"--download-metadata --repoid={}-debug -p {} --forcearch {} " "--download-metadata --repoid={}-debug -p {} --forcearch {} "
"--norepopath 2>&1 | tee -a {}/{}-{}-debug-{}.log").format( "--norepopath 2>&1 | tee -a {}/{}-{}-debug-{}.log").format(
self.dnf_config, self.dnf_config,
a,
r, r,
debug_sync_path, debug_sync_path,
a, a,
@ -459,11 +468,13 @@ class RepoSync:
entry_point_open.write('#!/bin/bash\n') entry_point_open.write('#!/bin/bash\n')
entry_point_open.write('set -o pipefail\n') entry_point_open.write('set -o pipefail\n')
entry_point_open.write(arch_force_cp + '\n')
entry_point_open.write('/usr/bin/dnf install dnf-plugins-core -y\n') entry_point_open.write('/usr/bin/dnf install dnf-plugins-core -y\n')
entry_point_open.write(sync_cmd + '\n') entry_point_open.write(sync_cmd + '\n')
debug_entry_point_open.write('#!/bin/bash\n') debug_entry_point_open.write('#!/bin/bash\n')
debug_entry_point_open.write('set -o pipefail\n') debug_entry_point_open.write('set -o pipefail\n')
debug_entry_point_open.write(arch_force_cp + '\n')
debug_entry_point_open.write('/usr/bin/dnf install dnf-plugins-core -y\n') debug_entry_point_open.write('/usr/bin/dnf install dnf-plugins-core -y\n')
debug_entry_point_open.write(debug_sync_cmd + '\n') debug_entry_point_open.write(debug_sync_cmd + '\n')