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

refine warn_text coding

Browse Source 
fixed superfluous whitespace
This commit is contained in:
Alf Gaida 2017-04-18 18:10:49 +02:00
parent 122667f9a7
commit fe14559f2f
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -170,7 +170,8 @@ def run_operations(pkgman, entry):
pkgman.install([package]) pkgman.install([package])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
warn_text = "WARNING: could not install package " warn_text = "WARNING: could not install package "
libcalamares.utils.debug(warn_text + package) warn_text += package
libcalamares.utils.debug(warn_text)
else: else:
try: try:
pkgman.run(package["pre-script"]) pkgman.run(package["pre-script"])
@ -178,8 +179,8 @@ def run_operations(pkgman, entry):
pkgman.run(package["post-script"]) pkgman.run(package["post-script"])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
warn_text = "WARNING: could not install packages " warn_text = "WARNING: could not install packages "
libcalamares.utils.debug(warn_text warn_text += package["package"]
+ package["package"]) libcalamares.utils.debug(warn_text)
elif key == "remove": elif key == "remove":
pkgman.remove(entry[key]) pkgman.remove(entry[key])
elif key == "try_remove": elif key == "try_remove":
@ -188,7 +189,8 @@ def run_operations(pkgman, entry):
pkgman.remove([package]) pkgman.remove([package])
except subprocess.CalledProcessError: except subprocess.CalledProcessError:
warn_text = "WARNING: could not remove package " warn_text = "WARNING: could not remove package "
libcalamares.utils.debug( warn_text + package) warn_text += package
libcalamares.utils.debug(warn_text)
elif key == "localInstall": elif key == "localInstall":
pkgman.install(entry[key], from_local=True) pkgman.install(entry[key], from_local=True)