From cd7e384d2c1f94d67ce9eb75827b42eb7e380628 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Fri, 22 Jul 2011 12:44:59 +0200 Subject: wafsamba: Properly lock object store when retrieving version through Bazaar. --- buildtools/wafsamba/samba_version.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'buildtools/wafsamba/samba_version.py') diff --git a/buildtools/wafsamba/samba_version.py b/buildtools/wafsamba/samba_version.py index 0c39ed44ec..96d5d0d47d 100644 --- a/buildtools/wafsamba/samba_version.py +++ b/buildtools/wafsamba/samba_version.py @@ -37,7 +37,11 @@ def bzr_version_summary(path): ret = "BZR-%d" % revno else: store = get_object_store(b.repository) - full_rev = store._lookup_revision_sha1(revid) + store.lock_read() + try: + full_rev = store._lookup_revision_sha1(revid) + finally: + store.unlock() fields["GIT_COMMIT_ABBREV"] = full_rev[:7] fields["GIT_COMMIT_FULLREV"] = full_rev ret = "GIT-" + fields["GIT_COMMIT_ABBREV"] -- cgit