From 122667f9a7cf32015903a55d69f6a258bdbb4224 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 29 Mar 2017 20:37:00 +0200 Subject: [PATCH 1/2] Fixed pep8 whining in module packages --- src/modules/packages/main.py | 67 ++++++++++++++++++++++++------------ 1 file changed, 45 insertions(+), 22 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index bfd8636f5..36692d3af 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -6,6 +6,7 @@ # Copyright 2014, Pier Luigi Fiorini # Copyright 2015-2017, Teo Mrnjavac # Copyright 2016-2017, Kyle Robbertze +# Copyright 2017, Alf Gaida # # Calamares is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -25,8 +26,10 @@ import libcalamares from libcalamares.utils import check_target_env_call, target_env_call from string import Template + class PackageManager: - """ Package manager class. + """ + Package manager class. :param backend: """ @@ -43,15 +46,19 @@ class PackageManager: for pkg in pkgs: check_target_env_call(["pkcon", "-py", "install", pkg]) elif self.backend == "zypp": - check_target_env_call(["zypper", "--non-interactive", "--quiet-install", "install", - "--auto-agree-with-licenses", "install"] + pkgs) + check_target_env_call(["zypper", "--non-interactive", + "--quiet-install", "install", + "--auto-agree-with-licenses", + "install"] + pkgs) elif self.backend == "yum": check_target_env_call(["yum", "install", "-y"] + pkgs) elif self.backend == "dnf": check_target_env_call(["dnf", "install", "-y"] + pkgs) elif self.backend == "urpmi": - check_target_env_call(["urpmi", "--download-all", "--no-suggests", "--no-verify-rpm", - "--fastunsafe", "--ignoresize", "--nolock", "--auto"] + pkgs) + check_target_env_call(["urpmi", "--download-all", "--no-suggests", + "--no-verify-rpm", "--fastunsafe", + "--ignoresize", "--nolock", + "--auto"] + pkgs) elif self.backend == "apt": check_target_env_call(["apt-get", "-q", "-y", "install"] + pkgs) elif self.backend == "pacman": @@ -60,7 +67,8 @@ class PackageManager: else: pacman_flags = "-Sy" - check_target_env_call(["pacman", pacman_flags, "--noconfirm"] + pkgs) + check_target_env_call(["pacman", pacman_flags, + "--noconfirm"] + pkgs) elif self.backend == "portage": check_target_env_call(["emerge", "-v"] + pkgs) elif self.backend == "entropy": @@ -75,17 +83,23 @@ class PackageManager: for pkg in pkgs: check_target_env_call(["pkcon", "-py", "remove", pkg]) elif self.backend == "zypp": - check_target_env_call(["zypper", "--non-interactive", "remove"] + pkgs) + check_target_env_call(["zypper", "--non-interactive", + "remove"] + pkgs) elif self.backend == "yum": - check_target_env_call(["yum", "--disablerepo=*", "-C", "-y", "remove"] + pkgs) + check_target_env_call(["yum", "--disablerepo=*", "-C", "-y", + "remove"] + pkgs) elif self.backend == "dnf": - # ignore the error code for now because dnf thinks removing a nonexistent package is an error - target_env_call(["dnf", "--disablerepo=*", "-C", "-y", "remove"] + pkgs) + # ignore the error code for now because dnf thinks removing a + # nonexistent package is an error + target_env_call(["dnf", "--disablerepo=*", "-C", "-y", + "remove"] + pkgs) elif self.backend == "urpmi": check_target_env_call(["urpme", "--auto"] + pkgs) elif self.backend == "apt": - check_target_env_call(["apt-get", "--purge", "-q", "-y", "remove"] + pkgs) - check_target_env_call(["apt-get", "--purge", "-q", "-y", "autoremove"]) + check_target_env_call(["apt-get", "--purge", "-q", "-y", + "remove"] + pkgs) + check_target_env_call(["apt-get", "--purge", "-q", "-y", + "autoremove"]) elif self.backend == "pacman": check_target_env_call(["pacman", "-Rs", "--noconfirm"] + pkgs) elif self.backend == "portage": @@ -120,7 +134,7 @@ def subst_locale(list): locale = libcalamares.globalstorage.value("locale") if locale: for e in list: - if locale != "en": + if locale != "en": entry = Template(e) ret.append(entry.safe_substitute(LOCALE=locale)) elif 'LOCALE' not in e: @@ -129,8 +143,10 @@ def subst_locale(list): ret = list return ret + def run_operations(pkgman, entry): - """ Call package manager with given parameters. + """ + Call package manager with given parameters. :param pkgman: :param entry: @@ -146,21 +162,24 @@ def run_operations(pkgman, entry): 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 + # we make a separate package manager call for each package so a + # single failing package won't stop all of them for package in entry[key]: if isinstance(package, str): try: pkgman.install([package]) except subprocess.CalledProcessError: - libcalamares.utils.debug("WARNING: could not install package {}".format(package)) + warn_text = "WARNING: could not install package " + libcalamares.utils.debug(warn_text + package) else: try: pkgman.run(package["pre-script"]) pkgman.install([package["package"]]) pkgman.run(package["post-script"]) except subprocess.CalledProcessError: - libcalamares.utils.debug("WARNING: could not install packages {}".format(package["package"])) + warn_text = "WARNING: could not install packages " + libcalamares.utils.debug(warn_text + + package["package"]) elif key == "remove": pkgman.remove(entry[key]) elif key == "try_remove": @@ -168,20 +187,23 @@ def run_operations(pkgman, entry): try: pkgman.remove([package]) except subprocess.CalledProcessError: - libcalamares.utils.debug("WARNING: could not remove package {}".format(package)) + warn_text = "WARNING: could not remove package " + libcalamares.utils.debug( warn_text + package) elif key == "localInstall": pkgman.install(entry[key], from_local=True) def run(): - """ Calls routine with detected package manager to install locale packages + """ + Calls routine with detected package manager to install locale packages or remove drivers not needed on the installed system. :return: """ backend = libcalamares.job.configuration.get("backend") - if backend not in ("packagekit", "zypp", "yum", "dnf", "urpmi", "apt", "pacman", "portage", "entropy"): + if backend not in ("packagekit", "zypp", "yum", "dnf", "urpmi", "apt", + "pacman", "portage", "entropy"): return "Bad backend", "backend=\"{}\"".format(backend) pkgman = PackageManager(backend) @@ -195,6 +217,7 @@ def run(): run_operations(pkgman, entry) if libcalamares.globalstorage.contains("packageOperations"): - run_operations(pkgman, libcalamares.globalstorage.value("packageOperations")) + run_operations(pkgman, + libcalamares.globalstorage.value("packageOperations")) return None From fe14559f2f8d006e2fca2ce74211114829214e29 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Tue, 18 Apr 2017 18:10:49 +0200 Subject: [PATCH 2/2] refine warn_text coding fixed superfluous whitespace --- src/modules/packages/main.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/modules/packages/main.py b/src/modules/packages/main.py index 36692d3af..93fcc9eb7 100644 --- a/src/modules/packages/main.py +++ b/src/modules/packages/main.py @@ -170,7 +170,8 @@ def run_operations(pkgman, entry): pkgman.install([package]) except subprocess.CalledProcessError: warn_text = "WARNING: could not install package " - libcalamares.utils.debug(warn_text + package) + warn_text += package + libcalamares.utils.debug(warn_text) else: try: pkgman.run(package["pre-script"]) @@ -178,8 +179,8 @@ def run_operations(pkgman, entry): pkgman.run(package["post-script"]) except subprocess.CalledProcessError: warn_text = "WARNING: could not install packages " - libcalamares.utils.debug(warn_text - + package["package"]) + warn_text += package["package"] + libcalamares.utils.debug(warn_text) elif key == "remove": pkgman.remove(entry[key]) elif key == "try_remove": @@ -188,7 +189,8 @@ def run_operations(pkgman, entry): pkgman.remove([package]) except subprocess.CalledProcessError: warn_text = "WARNING: could not remove package " - libcalamares.utils.debug( warn_text + package) + warn_text += package + libcalamares.utils.debug(warn_text) elif key == "localInstall": pkgman.install(entry[key], from_local=True)