afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

daemon: cleaned up requirement check, updated github workflow to modify correct file

Browse source
This commit is contained in:
Blake Harnden 2020-06-23 09:24:40 -07:00
parent e0c9f9c832
commit 8f19ad057c
2 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/daemon-checks.yml vendored
View file

@ -18,7 +18,7 @@ jobs:
cd daemon cd daemon
cp setup.py.in setup.py cp setup.py.in setup.py
cp core/constants.py.in core/constants.py cp core/constants.py.in core/constants.py
sed -i 's/True/False/g' core/constants.py sed -i 's/required=True/required=False/g' core/emulator/coreemu.py
pipenv sync --dev pipenv sync --dev
- name: isort - name: isort
run: | run: |

11
daemon/core/emulator/coreemu.py
View file

@ -79,15 +79,14 @@ class CoreEmu:
:return: nothing :return: nothing
:raises core.errors.CoreError: when an executable does not exist on path :raises core.errors.CoreError: when an executable does not exist on path
""" """
for requirement in COMMON_REQUIREMENTS: requirements = COMMON_REQUIREMENTS
utils.which(requirement, required=True)
use_ovs = self.config.get("ovs") == "True" use_ovs = self.config.get("ovs") == "True"
if use_ovs: if use_ovs:
for requirement in OVS_REQUIREMENTS: requirements += OVS_REQUIREMENTS
utils.which(requirement, required=True)
else: else:
for requirement in VCMD_REQUIREMENTS: requirements += VCMD_REQUIREMENTS
utils.which(requirement, required=True) for requirement in requirements:
utils.which(requirement, required=True)
def load_services(self) -> None: def load_services(self) -> None:
""" """