# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 1185007182 -7200
# Node ID 8933b8ea871a53b13653d1514eb07fe65575c6a6
# Parent  71fed370b7a77134e002eeb85312ca0065e0ad3c
Use format string for lockname again (was changed by 3e25a6eb5c9a)

diff --git a/mercurial/lock.py b/mercurial/lock.py
--- 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)