Fix do_install for missing keys, rearrange lines in conf
This commit is contained in:
parent
58117ceae4
commit
2cfd39dbde
1 changed files with 17 additions and 6 deletions
23
install.py
23
install.py
|
@ -119,14 +119,25 @@ class Installer:
|
||||||
|
|
||||||
if not packages:
|
if not packages:
|
||||||
try:
|
try:
|
||||||
packages = tuple(
|
# dict only contains os-specific packages
|
||||||
os_specific_packages[self.operating_system]
|
if "both" not in os_specific_packages.keys():
|
||||||
+ os_specific_packages["both"]
|
packages = tuple(
|
||||||
)
|
os_specific_packages[self.operating_system]
|
||||||
|
)
|
||||||
|
# some packages for other operating systems are in the dict
|
||||||
|
elif self.operating_system not in os_specific_packages.keys():
|
||||||
|
packages = tuple(
|
||||||
|
os_specific_packages["both"]
|
||||||
|
)
|
||||||
|
# dict contains specific and non-specific packages
|
||||||
|
else:
|
||||||
|
packages = tuple(
|
||||||
|
os_specific_packages[self.operating_system]
|
||||||
|
+ os_specific_packages["both"]
|
||||||
|
)
|
||||||
|
|
||||||
except KeyError:
|
except KeyError:
|
||||||
ui.fatal("Operating System not understood.")
|
ui.warning("No packages for {}".format(self.operating_system))
|
||||||
return
|
|
||||||
|
|
||||||
failed_installs = []
|
failed_installs = []
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue