summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2010-07-14 12:15:27 -0500
committerDennis Gilmore <dennis@ausil.us>2010-07-29 14:50:39 -0500
commit95ce88203f5ee7ef58c1e105c769a84c5356ea6a (patch)
tree2bfb870f3f9abeb6dc5eff0941e0621fd7f6b72c
parent8d4756b56f72bbff64a93877741da6f173bd0ad9 (diff)
downloadfedora-packager-95ce88203f5ee7ef58c1e105c769a84c5356ea6a.tar.gz
fedora-packager-95ce88203f5ee7ef58c1e105c769a84c5356ea6a.tar.xz
fedora-packager-95ce88203f5ee7ef58c1e105c769a84c5356ea6a.zip
wrap fedora-cert.py's calls to fedora-cert module and catch exceptions
-rwxr-xr-xsrc/fedora-cert.py24
1 files changed, 20 insertions, 4 deletions
diff --git a/src/fedora-cert.py b/src/fedora-cert.py
index 0a8a420..33ba433 100755
--- a/src/fedora-cert.py
+++ b/src/fedora-cert.py
@@ -23,22 +23,38 @@ def main(opts):
username = fedora_cert.read_user_cert()
except:
print "Can't determine fas name, lets get a new cert"
- fedora_cert.create_user_cert(None)
+ try:
+ fedora_cert.create_user_cert(None)
+ except fedora_cert.fedora_cert_error, e:
+ print e
+ sys.exit(1)
sys.exit(0)
else:
username = opts.username
#has cert expired? do we force a new cert? get a new one
if opts.newcert:
print "Getting a new User Certificate"
- fedora_cert.create_user_cert(username)
+ try:
+ fedora_cert.create_user_cert(username)
+ except fedora_cert.fedora_cert_error, e:
+ print e
+ sys.exit(1)
sys.exit(0)
if fedora_cert.certificate_expired():
print "Certificate has expired, getting a new one"
- fedora_cert.create_user_cert(username)
+ try:
+ fedora_cert.create_user_cert(username)
+ except fedora_cert.fedora_cert_error, e:
+ print e
+ sys.exit(1)
sys.exit(0)
if opts.verifycert:
print "Verifying Certificate"
- fedora_cert.verify_cert()
+ try:
+ fedora_cert.verify_cert()
+ except fedora_cert.fedora_cert_error, e:
+ print e
+ sys.exit(1)
print "CRL Checking not implemented yet"
if __name__ == '__main__':