Use format string for lockname again (was changed by 3e25a6eb5c9a)
authorThomas Arendsen Hein <thomas@intevation.de>
Sat, 21 Jul 2007 10:39:42 +0200
changeset 4959 8933b8ea871a
parent 4958 71fed370b7a7
child 4960 c79e3fa6dc29
Use format string for lockname again (was changed by 3e25a6eb5c9a)
mercurial/lock.py
--- a/mercurial/lock.py	Sat Jul 21 10:36:51 2007 +0200
+++ b/mercurial/lock.py	Sat Jul 21 10:39:42 2007 +0200
@@ -60,7 +60,7 @@
     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)