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

Merge branch 'kcghost-7645' into devel

Browse source
This commit is contained in:
James Cammarata 2014-06-09 10:49:58 -05:00
commit 2c9cba0631
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
library/packaging/svr4pkg
View file

@ -152,7 +152,7 @@ def package_install(module, name, src, proxy, response_file, zone, category):
os.unlink(adminfile) os.unlink(adminfile)
return (rc, out, err) return (rc, out, err)
def package_uninstall(module, name, src): def package_uninstall(module, name, src, category):
adminfile = create_admin_file() adminfile = create_admin_file()
if category: if category:
cmd = [ 'pkgrm', '-na', adminfile, '-Y', name ] cmd = [ 'pkgrm', '-na', adminfile, '-Y', name ]
@ -209,10 +209,18 @@ def main():
(rc, out, err) = package_uninstall(module, name, src, category) (rc, out, err) = package_uninstall(module, name, src, category)
out = out[:75] out = out[:75]
if rc is None: # Success, Warning, Interruption, Reboot all, Reboot this return codes
result['changed'] = False if rc in (0, 2, 3, 10, 20):
else:
result['changed'] = True result['changed'] = True
# no install nor uninstall, or failed
else:
result['changed'] = False
# Fatal error, Administration, Administration Interaction return codes
if rc in (1, 4 , 5):
result['failed'] = True
else:
result['failed'] = False
if out: if out:
result['stdout'] = out result['stdout'] = out