QubesOS/qubes-core-admin-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

repos rpc: use dnf native method of writing repository configuration

Browse Source 
Since we have new enough dnf version, native write_raw_configfile() can
be used, instead of external iniparse module.

QubesOS/qubes-issues#4550
This commit is contained in:
Marek Marczykowski-Górecki 2019-08-28 16:40:13 +02:00
parent 1089a7a07b
commit 9962fab124
No known key found for this signature in database
GPG Key ID: 063938BA42CFA724
2 changed files with 8 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
qubes-rpc/qubes.repos.Disable
View File

@ -4,7 +4,6 @@
# (probably an exception) # (probably an exception)
import dnf import dnf
import iniparse
import os import os
import sys import sys
@ -17,16 +16,9 @@ base.read_all_repos()
reponame = sys.argv[1] reponame = sys.argv[1]
repo = base.repos[reponame] repo = base.repos[reponame]
# Loosely based on write_raw_configfile() from DNF source code, because base.conf.write_raw_configfile(repo.repofile,
# that method was introduced in DNF 2.0 but Qubes dom0 has DNF 1.x. repo.id,
with open(repo.repofile) as fp: base.conf.substitutions,
ini = iniparse.INIConfig(fp) {'enabled': '0'})
ini[reponame]['enabled'] = 0
with open(repo.repofile + '.new', 'w') as fp:
fp.write(str(ini))
os.rename(repo.repofile + '.new', repo.repofile)
print('ok') print('ok')

16
qubes-rpc/qubes.repos.Enable
View File

@ -4,7 +4,6 @@
# (probably an exception) # (probably an exception)
import dnf import dnf
import iniparse
import os import os
import sys import sys
@ -17,16 +16,9 @@ base.read_all_repos()
reponame = sys.argv[1] reponame = sys.argv[1]
repo = base.repos[reponame] repo = base.repos[reponame]
# Loosely based on write_raw_configfile() from DNF source code, because base.conf.write_raw_configfile(repo.repofile,
# that method was introduced in DNF 2.0 but Qubes dom0 has DNF 1.x. repo.id,
with open(repo.repofile) as fp: base.conf.substitutions,
ini = iniparse.INIConfig(fp) {'enabled': '1'})
ini[reponame]['enabled'] = 1
with open(repo.repofile + '.new', 'w') as fp:
fp.write(str(ini))
os.rename(repo.repofile + '.new', repo.repofile)
print('ok') print('ok')