Merge pull request #3 from damien-list/master

[git-mirror.git] / webhook-core.py

diff --git a/webhook-core.py b/webhook-core.py
index 934d41f85ffd04436372cf9ff17368355531e4e5..90432c82557839030718dfe899b1a3ef16ebb75c 100755 (executable)
--- a/webhook-core.py
+++ b/webhook-core.py
@@ -46,12 +46,12 @@ 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]
         if reponame not in repos:
-            raise Exception("Repository missing or not found.")
+            raise Exception("Repository {} missing or not found.".format(reponame))
         repo = repos[reponame]
         
         # now sync this repository
@@ -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"):
@@ -76,18 +76,19 @@ if __name__ == "__main__":
             mirror = repo.find_mirror_by_url(urls)
             if mirror is None:
                 raise Exception("Could not find the mirror.")
-            repo.update_ref_from_mirror(ref, oldsha, newsha, mirror, suppress_stderr = True)
+            stdout = repo.update_ref_from_mirror(ref, oldsha, newsha, mirror, suppress_stderr = True)
             # 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("git-mirror: We have a problem:\n{}".format('\n'.join(traceback.format_exception_only(type(e), e))))