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

Replace CommandException with Exception

Browse source
This commit is contained in:
Andrew Resch 2014-05-23 12:44:01 -07:00
parent 6fa11d1d53
commit 5016dc40fc
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
packaging/redhat_subscription
View file

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