From 8fc0e84d2f91e2c6e3b13f27d8ab4887b23b4ec7 Mon Sep 17 00:00:00 2001
From: Sergio Durigan Junior <sergiodj@sergiodj.net>
Date: Fri, 23 Jan 2015 20:36:09 -0500
Subject: [PATCH] Adjust get_builder_commit_id

---
 lib/gdbgitdb.py | 4 ++--
 master.cfg      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/gdbgitdb.py b/lib/gdbgitdb.py
index 6c77c2b..04714f8 100644
--- a/lib/gdbgitdb.py
+++ b/lib/gdbgitdb.py
@@ -8,12 +8,12 @@ from datetime import datetime
 import git
 import re
 
-def get_builder_commit_id (builder, commit):
+def get_builder_commit_id (builder, commit, branch):
     """Get the commit hash in the BUILDER's repository which points to the
 log files of the COMMIT that was tested."""
     repodir = os.path.join (get_web_base (), builder)
     repo = git.Repo.init (path = repodir)
-    commit_id_re = re.compile ("^\d{8}-\d{6}-%s$" % commit)
+    commit_id_re = re.compile ("^\d{8}-\d{6}-%s-%s$" % (commit, branch))
 
     for t in repo.tags:
         m = commit_id_re.match (t.name)
diff --git a/master.cfg b/master.cfg
index 03ed49a..4ba6988 100644
--- a/master.cfg
+++ b/master.cfg
@@ -168,7 +168,7 @@ send to the gdb-testers mailing list."""
     # URL to find more info about what went wrong.
     text += "\nTestsuite log (gdb.sum and gdb.log) URL(s):\n"
     for ss in ss_list:
-        commit_id = get_builder_commit_id (name, ss.revision)
+        commit_id = get_builder_commit_id (name, ss.revision, ss.branch)
         if commit_id:
             text += "\t<%s/%s/.git/tree/?id=%s>\n" % (git_url, name, commit_id)
         else: