From: Zooko O'Whielacronx <zooko@zooko.com>
Date: Tue, 7 Jul 2009 14:34:04 +0000 (-0700)
Subject: directories: rename internal data member download_cache to download_cache_dirman... 
X-Git-Url: https://git.rkrishnan.org/pf/content/simplejson/provisioning?a=commitdiff_plain;h=c678e8c77a5629e2772c60a23dbeb7ac015afb12;p=tahoe-lafs%2Ftahoe-lafs.git

directories: rename internal data member download_cache to download_cache_dirman (benchmarks set this internal member and use the new name, so changing this makes the bench_dirnode.py work again)
---

diff --git a/src/allmydata/client.py b/src/allmydata/client.py
index 8c1dc21f..5df1acbc 100644
--- a/src/allmydata/client.py
+++ b/src/allmydata/client.py
@@ -230,8 +230,8 @@ class Client(node.Node, pollmixin.PollMixin):
         self.add_service(Uploader(helper_furl, self.stats_provider))
         download_cachedir = os.path.join(self.basedir,
                                          "private", "cache", "download")
-        self.download_cache = cachedir.CacheDirectoryManager(download_cachedir)
-        self.download_cache.setServiceParent(self)
+        self.download_cache_dirman = cachedir.CacheDirectoryManager(download_cachedir)
+        self.download_cache_dirman.setServiceParent(self)
         self.add_service(Downloader(self.stats_provider))
         self.init_stub_client()
 
@@ -429,7 +429,7 @@ class Client(node.Node, pollmixin.PollMixin):
                     node = LiteralFileNode(u, self) # LIT
                 else:
                     key = base32.b2a(u.storage_index)
-                    cachefile = self.download_cache.get_file(key)
+                    cachefile = self.download_cache_dirman.get_file(key)
                     node = FileNode(u, self, cachefile) # CHK
             else:
                 assert IMutableFileURI.providedBy(u), u