summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDennis Gilmore <dennis@ausil.us>2010-07-14 12:12:24 -0500
committerDennis Gilmore <dennis@ausil.us>2010-07-29 14:50:39 -0500
commit8d4756b56f72bbff64a93877741da6f173bd0ad9 (patch)
treeb5b9a7c4a3897a89ba83747d484fd2e8c5eda4d0
parent506d8815b77555ffb3bd806d437875886b6fdbb4 (diff)
downloadfedora-packager-8d4756b56f72bbff64a93877741da6f173bd0ad9.tar.gz
fedora-packager-8d4756b56f72bbff64a93877741da6f173bd0ad9.tar.xz
fedora-packager-8d4756b56f72bbff64a93877741da6f173bd0ad9.zip
wrap fedora_cert calls in try: except: and catch the error
-rwxr-xr-xsrc/fedora-packager-setup.py18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/fedora-packager-setup.py b/src/fedora-packager-setup.py
index 0678777..e096d42 100755
--- a/src/fedora-packager-setup.py
+++ b/src/fedora-packager-setup.py
@@ -108,13 +108,21 @@ def main():
server_ca_cert = os.path.join(user_home, '.fedora-server-ca.cert')
if not os.path.isfile(user_cert):
print '''You need a client certificate from the Fedora Account System, lets get one now'''
- fedora_cert.create_user_cert()
+ try:
+ fedora_cert.create_user_cert()
+ except fedora_cert.fedora_cert_error, e:
+ print e
+ sys.exit(1)
else:
#check if the cert has expired if it has lets get a new one
- if fedora_cert.certificate_expired():
- username = fedora_cert.read_user_cert()
- print "Certificate has expired, getting a new one"
- fedora_cert.create_user_cert(username)
+ try:
+ if fedora_cert.certificate_expired():
+ username = fedora_cert.read_user_cert()
+ print "Certificate has expired, getting a new one"
+ fedora_cert.create_user_cert(username)
+ except fedora_cert.fedora_cert_error, e:
+ print e
+ sys.exit(1)
download_cert('https://admin.fedoraproject.org/accounts/fedora-server-ca.cert', server_ca_cert)
if not os.path.islink(upload_ca_cert):