napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed two bugs in packages module

Browse Source 
if the key "install" was used, the install would crash as the backwards
compatibility checks were incorrect. Fixed a typo in the run function so
pre- and post-install hooks now work correctly
This commit is contained in:
Kyle Robertze 2017-02-20 14:22:18 +02:00 committed by Philip
parent 99118e06e6
commit 901e53da76
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/packages/main.py
View File

@ -112,7 +112,7 @@ class PackageManager:
def run(self, script):
if script != "":
check_target_env_call(scrtip.split(" "))
check_target_env_call(script.split(" "))
def subst_locale(list):
@ -138,13 +138,13 @@ def run_operations(pkgman, entry):
for key in entry.keys():
entry[key] = subst_locale(entry[key])
if key == "install":
if isinstance(package, str):
pkgman.install(entry[key])
else:
if isinstance(entry[key], list):
for package in entry[key]:
pkgman.run(package["pre-script"])
pkgman.install([package["package"]])
pkgman.run(package["post-script"])
else:
pkgman.install(entry[key])
elif key == "try_install":
# we make a separate package manager call for each package so a single
# failing package won't stop all of them