fix catching exceptions

[git-mirror.git] / github-add-hooks.py

diff --git a/github-add-hooks.py b/github-add-hooks.py
index 8e65d8692004e364710965b22735e87f620e377a..3a2d66cdcc70b3cc889ca34ea77ba27bd425bfb4 100755 (executable)
--- a/github-add-hooks.py
+++ b/github-add-hooks.py
@@ -42,7 +42,7 @@ conf = read_config()
 parser = argparse.ArgumentParser(description='Update and build a bunch of stuff')
 parser.add_argument("-o", "--owner",
                     dest="owner",
-                    help="The owner of this hook on GitHub")
+                    help="The username of the owner of this hook on GitHub")
 parser.add_argument("-e", "--email",
                     dest="email",
                     help="An email address that gets notified in case of trouble with the hook")
@@ -68,7 +68,7 @@ webhook_url = conf['DEFAULT']['webhook-url']
 shutil.copy(config_file, config_file+".bak")
 with open(config_file, 'a') as f:
     f.write('\n[{}]\n'.format(args.name))
-    f.write('owner={}\n'.format(args.owner))
+    f.write('owner={}\n'.format(args.email))
     f.write('local={}\n'.format(args.local))
     f.write('deploy-key={}\n'.format(os.path.basename(ssh_deploy_key)))
     f.write('hmac-secret={}\n'.format(hmac_secret))
@@ -78,8 +78,8 @@ try:
     generate_ssh_key(ssh_deploy_key, 4*1024)
     add_deploy_key(ssh_deploy_key, args.owner, args.name, github_token)
     add_web_hook(webhook_url+"?repository="+args.name, hmac_secret, args.owner, args.name, github_token)
-    print("Done! Your GitHub repository is set up.\nRemember to configure the git-mirror hook for the local repository {}, e.g. in your gitolite configuration!", args.local)
-except E:
+    print("Done! Your GitHub repository is set up.\nRemember to configure the git-mirror hook for the local repository {}, e.g. in your gitolite configuration!".format(args.local))
+except Exception as E:
     shutil.copy(config_file+".bak", config_file)
     raise