almalinux/kiwi-el8
14
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix setopt argument for install_weak_deps for microdnf

Browse Source 
Micro DNF does not support "True"/"False", only "1"/"0"...
This commit is contained in:
Neal Gompa 2020-11-16 11:59:06 -05:00
parent 9c89d1fa00
commit 7ebeeca10b
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiwi/package_manager/microdnf.py
View File

@ -203,15 +203,15 @@ class PackageManagerMicroDnf(PackageManagerBase):
"""
Setup package processing only for required packages
"""
if '--setopt=install_weak_deps=False' not in self.custom_args:
self.custom_args.append('--setopt=install_weak_deps=False')
if '--setopt=install_weak_deps=0' not in self.custom_args:
self.custom_args.append('--setopt=install_weak_deps=0')
def process_plus_recommended(self):
"""
Setup package processing to also include recommended dependencies.
"""
if '--setopt=install_weak_deps=False' in self.custom_args:
self.custom_args.remove('--setopt=install_weak_deps=False')
if '--setopt=install_weak_deps=0' in self.custom_args:
self.custom_args.remove('--setopt=install_weak_deps=0')
def match_package_installed(self, package_name, dnf_output):
"""

6
test/unit/package_manager/microdnf_test.py
View File

@ -117,14 +117,14 @@ class TestPackageManagerMicroDnf:
def test_process_only_required(self):
self.manager.process_only_required()
assert self.manager.custom_args == ['--setopt=install_weak_deps=False']
assert self.manager.custom_args == ['--setopt=install_weak_deps=0']
def test_process_plus_recommended(self):
self.manager.process_only_required()
assert self.manager.custom_args == ['--setopt=install_weak_deps=False']
assert self.manager.custom_args == ['--setopt=install_weak_deps=0']
self.manager.process_plus_recommended()
assert \
'--setopt=install_weak_deps=False' not in self.manager.custom_args
'--setopt=install_weak_deps=0' not in self.manager.custom_args
def test_match_package_installed(self):
assert self.manager.match_package_installed('foo', 'Installing : foo')