aboutsummaryrefslogtreecommitdiff
path: root/gitolite-tools/gitolite-keys
diff options
context:
space:
mode:
Diffstat (limited to 'gitolite-tools/gitolite-keys')
-rwxr-xr-xgitolite-tools/gitolite-keys10
1 files changed, 5 insertions, 5 deletions
diff --git a/gitolite-tools/gitolite-keys b/gitolite-tools/gitolite-keys
index ad52ee8..2b43423 100755
--- a/gitolite-tools/gitolite-keys
+++ b/gitolite-tools/gitolite-keys
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
# Copyright (C) 2013, 2014 Linaro Ltd.
#
# This program is free software: you can redistribute it and/or modify
@@ -48,7 +48,7 @@ def run_cmd(cmd_args, shell=False, cwd=None):
log.error("Error executing the following command: "
"{0}".format(" ".join(cmd_args)))
log.error("Command stderr:\n{0}".format(err))
- except OSError, e:
+ except OSError as e:
log.error(str(e))
@@ -81,7 +81,7 @@ def gitolite_remove_key(key_name):
log.info("Removing public key {0}...".format(key_name))
try:
os.unlink(pubkey_file)
- except OSError, e:
+ except OSError as e:
log.error(str(e))
else:
log.info("Public key {0} does not exists.".format(key_name))
@@ -90,7 +90,7 @@ def gitolite_remove_key(key_name):
def gitolite_add_key(key_name, ssh_key):
"""Adds the provided key_name and their SSH key to the gitolite keydir."""
if not os.path.exists(KEYDIR):
- os.makedirs(KEYDIR, 0700)
+ os.makedirs(KEYDIR, mode=0o700)
pubkey_file = os.path.join(KEYDIR, key_name)
@@ -106,7 +106,7 @@ def gitolite_add_key(key_name, ssh_key):
except OSError:
log.error("Error writing file {0}.".format(pubkey_file))
else:
- os.chmod(pubkey_file, 0600)
+ os.chmod(pubkey_file, 0o600)
def gitolite_trigger_auth_keys():