wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #7524 from aresch/patch-2

Browse source 
Replace CommandException with Exception
This commit is contained in:
James Cammarata 2014-05-23 16:14:28 -05:00
commit 67fe23e166
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
library/packaging/redhat_subscription
View file

@ -372,7 +372,7 @@ def main():
rhn.configure(**module.params)
rhn.register(username, password, autosubscribe, activationkey)
rhn.subscribe(pool)
except CommandException, e:
except Exception, e:
module.fail_json(msg="Failed to register with '%s': %s" % (server_hostname, e))
else:
module.exit_json(changed=True, msg="System successfully registered to '%s'." % server_hostname)
@ -385,7 +385,7 @@ def main():
try:
rhn.unsubscribe()
rhn.unregister()
except CommandException, e:
except Exception, e:
module.fail_json(msg="Failed to unregister: %s" % e)
else:
module.exit_json(changed=True, msg="System successfully unregistered from %s." % server_hostname)