Mercurial > hg > mercurial-crew-with-dirclash

changeset 4941:8933b8ea871a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use format string for lockname again (was changed by 3e25a6eb5c9a)
author Thomas Arendsen Hein <thomas@intevation.de>
date Sat, 21 Jul 2007 10:39:42 +0200
parents 71fed370b7a7
children c79e3fa6dc29
files mercurial/lock.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/lock.py
+++ b/mercurial/lock.py
@@ -60,7 +60,7 @@ class lock(object):
     def trylock(self):
         if lock._host is None:
             lock._host = socket.gethostname()
-        lockname = lock._host + ':' + str(os.getpid())
+        lockname = '%s:%s' % (lock._host, os.getpid())
         while not self.held:
             try:
                 util.makelock(lockname, self.f)