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

corrected packages syntax errors

Browse Source
This commit is contained in:
Kyle Robertze 2017-01-26 10:36:05 +02:00 committed by Teo Mrnjavac
parent 45facda3cb
commit 4d24942547
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -103,7 +103,9 @@ class PackageManager:
elif self.backend == "zypp": elif self.backend == "zypp":
check_target_env_call(["zypper", "--non-interactive", "update"]) check_target_env_call(["zypper", "--non-interactive", "update"])
elif self.backend == "urpmi": elif self.backend == "urpmi":
check_target_env_call(["urpmi.update", "-a"]) elif self.backend == "apt": check_target_env_call(["apt-get", "update"]) check_target_env_call(["urpmi.update", "-a"])
elif self.backend == "apt":
check_target_env_call(["apt-get", "update"])
elif self.backend == "pacman": elif self.backend == "pacman":
check_target_env_call(["pacman", "-Sy"]) check_target_env_call(["pacman", "-Sy"])
elif self.backend == "portage": elif self.backend == "portage":
@ -111,6 +113,10 @@ class PackageManager:
elif self.backend == "entropy": elif self.backend == "entropy":
check_target_env_call(["equo", "update"]) check_target_env_call(["equo", "update"])
def run(self, script):
if script != "":
check_target_env_call(scrtip.split(" "))
def subst_locale(list): def subst_locale(list):
ret = [] ret = []
@ -157,7 +163,7 @@ def run_operations(pkgman, entry):
pkgman.install([package["package"]]) pkgman.install([package["package"]])
pkgman.run(package["post-script"]) pkgman.run(package["post-script"])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
libcalamares.utils.debug("WARNING: could not install packages {}", package["package"]) libcalamares.utils.debug("WARNING: could not install packages {}".format(package["package"]))
elif key == "remove": elif key == "remove":
pkgman.remove(entry[key]) pkgman.remove(entry[key])
elif key == "try_remove": elif key == "try_remove":