Rev 5359: Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass. in file:///home/vila/src/bzr/bugs/525571-lock-bazaar-conf-files/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/525571-lock-bazaar-conf-files/

------------------------------------------------------------
revno: 5359
revision-id: v.ladeuil+lp at free.fr-20100722092207-x1wtzwnqva9aa17r
parent: v.ladeuil+lp at free.fr-20100722083545-1qvav61t0d4rrojc
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: lockable-config-files
timestamp: Thu 2010-07-22 11:22:07 +0200
message:
  Make bb.test_version.TestVersionUnicodeOutput.test_unicode_bzr_home pass.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2010-07-22 08:35:45 +0000
+++ b/bzrlib/config.py	2010-07-22 09:22:07 +0000
@@ -536,14 +536,17 @@
     serialized.
     """
 
+    lock_name = 'lock'
+
     def __init__(self, file_name, _content=None):
         super(LockableConfig, self).__init__(file_name=file_name,
                                              _content=_content)
-        t = transport.get_transport(config_dir())
-        self._lock = lockdir.LockDir(t, 'lock')
+        self.dir = osutils.dirname(osutils.safe_unicode(self.file_name))
+        self.transport = transport.get_transport(self.dir)
+        self._lock = lockdir.LockDir(self.transport, 'lock')
 
     def lock_write(self, token=None):
-        ensure_config_dir_exists(config_dir())
+        ensure_config_dir_exists(self.dir)
         return self._lock.lock_write(token)
 
     def unlock(self):