Rev 5761: Both GlobalStore and LocationStore need locks, BranchStore should rely on the branch lock itself. in file:///home/vila/src/bzr/experimental/config/

Vincent Ladeuil v.ladeuil+lp at free.fr
Wed Apr 6 17:33:30 UTC 2011


At file:///home/vila/src/bzr/experimental/config/

------------------------------------------------------------
revno: 5761
revision-id: v.ladeuil+lp at free.fr-20110406173330-ek2qi1q6fzy5ee2m
parent: v.ladeuil+lp at free.fr-20110406173218-fmlzozjyn5ru5v0b
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: config-concrete-stores
timestamp: Wed 2011-04-06 19:33:30 +0200
message:
  Both GlobalStore and LocationStore need locks, BranchStore should rely on the branch lock itself.
-------------- next part --------------
=== modified file 'bzrlib/config.py'
--- a/bzrlib/config.py	2011-04-06 17:32:18 +0000
+++ b/bzrlib/config.py	2011-04-06 17:33:30 +0000
@@ -2194,7 +2194,7 @@
 # FIXME: global, bazaar, shouldn't that be 'user' instead or even
 # 'user_defaults' as opposed to 'user_overrides', 'system_defaults'
 # (/etc/bzr/bazaar.conf) and 'system_overrides' ? -- vila 2011-04-05
-class GlobalStore(ConfigObjStore):
+class GlobalStore(LockableConfigObjStore):
 
     def __init__(self, possible_transports=None):
         t = transport.get_transport(config_dir(),
@@ -2202,7 +2202,7 @@
         super(GlobalStore, self).__init__(t, 'bazaar.conf')
 
 
-class LocationStore(ConfigObjStore):
+class LocationStore(LockableConfigObjStore):
 
     def __init__(self, possible_transports=None):
         t = transport.get_transport(config_dir(),



More information about the bazaar-commits mailing list