cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

pkgin: add stdout to error message when shell commands fail

Browse source
This commit is contained in:
Shaun Zinck 2013-01-25 16:58:29 -06:00
parent a25575cee9
commit 835d7e9bc8
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgin
View file

@ -63,7 +63,7 @@ def query_package(module, name, state="installed"):
if state == "installed": if state == "installed":
(rc, stdout, stderr) = module.run_command("%s list | grep ^%s" % (PKGIN_PATH, name)) rc, out, err = module.run_command("%s list | grep ^%s" % (PKGIN_PATH, name))
if rc == 0: if rc == 0:
return True return True
@ -80,10 +80,10 @@ def remove_packages(module, packages):
if not query_package(module, package): if not query_package(module, package):
continue continue
module.run_command("%s -y remove %s" % (PKGIN_PATH, package)) rc, out, err = module.run_command("%s -y remove %s" % (PKGIN_PATH, package))
if query_package(module, package): if query_package(module, package):
module.fail_json(msg="failed to remove %s" % (package)) module.fail_json(msg="failed to remove %s: %s" % (package, out))
remove_c += 1 remove_c += 1
@ -102,10 +102,10 @@ def install_packages(module, packages):
if query_package(module, package): if query_package(module, package):
continue continue
module.run_command("%s -y install %s" % (PKGIN_PATH, package)) rc, out, err = module.run_command("%s -y install %s" % (PKGIN_PATH, package))
if not query_package(module, package): if not query_package(module, package):
module.fail_json(msg="failed to install %s" % (package)) module.fail_json(msg="failed to install %s: %s" % (package, out))
install_c += 1 install_c += 1