archive/git-mirror
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

avoid needless format string position identifiers

Browse source
This commit is contained in:
Ralf Jung 2015-03-06 13:20:13 +01:00
parent a0776d1336
commit 9e8ef5ff99
3 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
git_mirror.py
View file

@ -40,7 +40,7 @@ class GitCommand:
assert stderr is None
code = p.returncode
if check and code:
raise Exception("Error running {0}: Non-zero exit code".format(cmd))
raise Exception("Error running {}: Non-zero exit code".format(cmd))
return (stdout.decode('utf-8').strip('\n'), code)
return call
@ -93,7 +93,7 @@ class Repo:
def mail_owner(self, msg):
global mail_sender
send_mail("git-mirror {0}".format(self.name), msg, recipients = [self.owner], sender = mail_sender)
send_mail("git-mirror {}".format(self.name), msg, recipients = [self.owner], sender = mail_sender)
def compute_hmac(self, data):
h = hmac.new(self.hmac_secret, digestmod = hashlib.sha1)
@ -125,7 +125,7 @@ class Repo:
for mirror in self.mirrors:
if mirror == source_mirror:
continue
sys.stdout.write("Updating mirror {0}\n".format(mirror)); sys.stdout.flush()
sys.stdout.write("Updating mirror {}\n".format(mirror)); sys.stdout.flush()
# update this mirror
if is_forced:
# forcibly update ref remotely (someone already did a force push and hence accepted data loss)
@ -144,14 +144,14 @@ class Repo:
remote_sha = remote_state.split()[0]
else:
remote_sha = git_nullsha
assert newsha == remote_sha, "Someone lied about the new SHA, which should be {0}.".format(newsha)
assert newsha == remote_sha, "Someone lied about the new SHA, which should be {}.".format(newsha)
# locally, we have to be at oldsha or newsha (the latter can happen if we already got this update, e.g. if it originated from us)
local_state, code = git.show_ref(ref, check=False)
if code == 0:
local_sha = local_state.split()[0]
else:
if len(local_state):
raise Exception("Something went wrong getting the local state of {0}.".format(ref))
raise Exception("Something went wrong getting the local state of {}.".format(ref))
local_sha = git_nullsha
assert local_sha in (oldsha, newsha), "Someone lied about the old SHA."
# if we are already at newsha locally, we also ran the local hooks, so we do not have to do anything
@ -175,10 +175,10 @@ class Repo:
# are one of these hooks!
os.putenv("GIT_MIRROR_SOURCE", mirror) # tell ourselves which repo we do *not* have to update
with subprocess.Popen(['/bin/sh', 'hooks/post-receive'], stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) as p:
(stdout, stderr) = p.communicate("{0} {1} {2}\n".format(oldsha, newsha, ref).encode('utf-8'))
(stdout, stderr) = p.communicate("{} {} {}\n".format(oldsha, newsha, ref).encode('utf-8'))
stdout = stdout.decode('utf-8')
if p.returncode:
raise Exception("post-receive git hook terminated with non-zero exit code {0}:\n{1}".format(p.returncode, stdout))
raise Exception("post-receive git hook terminated with non-zero exit code {}:\n{}".format(p.returncode, stdout))
return stdout
def find_repo_by_directory(repos, dir):

4
githook.py
View file

@ -45,7 +45,7 @@ if __name__ == "__main__":
repo.update_mirrors(ref, oldsha, newsha)
except Exception as e:
if repo is not None:
repo.mail_owner("There was a problem running the git-mirror git hook:\n\n{0}".format(traceback.format_exc()))
repo.mail_owner("There was a problem running the git-mirror git hook:\n\n{}".format(traceback.format_exc()))
# do not print all the details
sys.stderr.write("We have a problem:\n{0}".format('\n'.join(traceback.format_exception_only(type(e), e))))
sys.stderr.write("We have a problem:\n{}".format('\n'.join(traceback.format_exception_only(type(e), e))))

12
webhook-core.py
View file

@ -46,7 +46,7 @@ if __name__ == "__main__":
try:
repos = load_repos()
if len(sys.argv) < 4:
raise Exception("Usage: {0} <reponame> <event name> <signature>".format(os.path.basename(sys.argv[0])))
raise Exception("Usage: {} <reponame> <event name> <signature>".format(os.path.basename(sys.argv[0])))
reponame = sys.argv[1]
githubEvent = sys.argv[2]
githubSignature = sys.argv[3]
@ -68,7 +68,7 @@ if __name__ == "__main__":
newsha = data["after"]
# validate the ref name
if re.match('refs/[a-z/]+', ref) is None:
raise Exception("Invalid ref name {0}".format(ref))
raise Exception("Invalid ref name {}".format(ref))
# collect URLs of this repository, to find the mirror name
urls = []
for key in ("git_url", "ssh_url", "clone_url"):
@ -80,15 +80,15 @@ if __name__ == "__main__":
# print an answer
print("Content-Type: text/plain")
print()
print("Updated {0}:{1} from mirror {2} from {3} to {4}".format(reponame, ref, mirror, oldsha, newsha))
print("Updated {}:{} from mirror {} from {} to {}".format(reponame, ref, mirror, oldsha, newsha))
print(stdout)
else:
raise Exception("Unexpected github event {0}.".format(githubEvent))
raise Exception("Unexpected github event {}.".format(githubEvent))
except Exception as e:
if repo is not None:
repo.mail_owner("There was a problem running the git-mirror webhook:\n\n{0}".format(traceback.format_exc()))
repo.mail_owner("There was a problem running the git-mirror webhook:\n\n{}".format(traceback.format_exc()))
# do not print all the details
print("Status: 500 Internal Server Error")
print("Content-Type: text/plain")
print()
print("We have a problem:\n{0}".format('\n'.join(traceback.format_exception_only(type(e), e))))
print("We have a problem:\n{}".format('\n'.join(traceback.format_exception_only(type(e), e))))