git.samba.org
/
ira
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
e6dcee9
)
wafsamba: Properly lock object store when retrieving version through Bazaar.
author
Jelmer Vernooij
<jelmer@samba.org>
Fri, 22 Jul 2011 10:44:59 +0000
(12:44 +0200)
committer
Jelmer Vernooij
<jelmer@samba.org>
Sat, 23 Jul 2011 20:08:10 +0000
(22:08 +0200)
buildtools/wafsamba/samba_version.py
patch
|
blob
|
history
diff --git
a/buildtools/wafsamba/samba_version.py
b/buildtools/wafsamba/samba_version.py
index 0c39ed44ecdf938a2ec867b96b7f642bf657d418..96d5d0d47d314e2b2b694471ed3754497e26198c 100644
(file)
--- 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"]