summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJürg Billeter <j@bitron.ch>2019-02-27 11:12:22 +0100
committerbst-marge-bot <marge-bot@buildstream.build>2019-03-01 05:11:55 +0000
commitba3dbeda34f14c2ff59be9e5f1fc5b92052eb383 (patch)
tree6df039b5a1c1704e1d1bfe27765650940e76c8ad
parent537d842d7603ff65cdba5b5122b6b117362c710e (diff)
downloadbuildstream-ba3dbeda34f14c2ff59be9e5f1fc5b92052eb383.tar.gz
Remove unneeded ref=None argument from CasBasedDirectory() calls
-rw-r--r--buildstream/element.py2
-rw-r--r--buildstream/sandbox/_sandboxremote.py2
-rw-r--r--buildstream/sandbox/sandbox.py2
3 files changed, 3 insertions, 3 deletions
diff --git a/buildstream/element.py b/buildstream/element.py
index fff95d0f5..9d1333721 100644
--- a/buildstream/element.py
+++ b/buildstream/element.py
@@ -1691,7 +1691,7 @@ class Element(Plugin):
context = self._get_context()
- assemblevdir = CasBasedDirectory(cas_cache=context.artifactcache.cas, ref=None)
+ assemblevdir = CasBasedDirectory(cas_cache=context.artifactcache.cas)
logsvdir = assemblevdir.descend("logs", create=True)
metavdir = assemblevdir.descend("meta", create=True)
buildtreevdir = assemblevdir.descend("buildtree", create=True)
diff --git a/buildstream/sandbox/_sandboxremote.py b/buildstream/sandbox/_sandboxremote.py
index fbec1709e..3a0b651a0 100644
--- a/buildstream/sandbox/_sandboxremote.py
+++ b/buildstream/sandbox/_sandboxremote.py
@@ -308,7 +308,7 @@ class SandboxRemote(Sandbox):
cascache = self._get_context().get_cascache()
if isinstance(upload_vdir, FileBasedDirectory):
# Make a new temporary directory to put source in
- upload_vdir = CasBasedDirectory(cascache, ref=None)
+ upload_vdir = CasBasedDirectory(cascache)
upload_vdir.import_files(self.get_virtual_directory()._get_underlying_directory())
upload_vdir.recalculate_hash()
diff --git a/buildstream/sandbox/sandbox.py b/buildstream/sandbox/sandbox.py
index 2159c0fef..ca4652599 100644
--- a/buildstream/sandbox/sandbox.py
+++ b/buildstream/sandbox/sandbox.py
@@ -191,7 +191,7 @@ class Sandbox():
"""
if self._vdir is None or self._never_cache_vdirs:
if 'BST_CAS_DIRECTORIES' in os.environ:
- self._vdir = CasBasedDirectory(self.__context.artifactcache.cas, ref=None)
+ self._vdir = CasBasedDirectory(self.__context.artifactcache.cas)
else:
self._vdir = FileBasedDirectory(self._root)
return self._vdir