summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarius Makovsky <traveltissues@protonmail.com>2019-12-24 12:49:06 +0000
committerDarius Makovsky <traveltissues@protonmail.com>2019-12-24 12:49:06 +0000
commit7265eebacfa2f19cbd93f1e89f98ea211654f7bf (patch)
treeaa01edce5c70150b09e396411e187724f4c570ea
parent9126e7f59953eba5ba46e7fcdc84ba125130fb98 (diff)
parenta44c2eb805acb51c66bb831e9578e6b765850d0c (diff)
downloadbuildstream-7265eebacfa2f19cbd93f1e89f98ea211654f7bf.tar.gz
Merge branch 'traveltissues/remove-unused' into 'master'
Remove unused functions 2 See merge request BuildStream/buildstream!1781
-rw-r--r--src/buildstream/_sourcecache.py28
-rw-r--r--src/buildstream/_state.py3
-rw-r--r--src/buildstream/sandbox/sandbox.py30
-rw-r--r--src/buildstream/storage/_casbaseddirectory.py3
4 files changed, 0 insertions, 64 deletions
diff --git a/src/buildstream/_sourcecache.py b/src/buildstream/_sourcecache.py
index 221694e94..e485fbd47 100644
--- a/src/buildstream/_sourcecache.py
+++ b/src/buildstream/_sourcecache.py
@@ -132,16 +132,6 @@ class SourceCache(BaseCache):
self._basedir = os.path.join(context.cachedir, "source_protos")
os.makedirs(self._basedir, exist_ok=True)
- # list_sources()
- #
- # Get list of all sources in the `sources_protos/` folder
- #
- # Returns:
- # ([str]): iterable over all source refs
- #
- def list_sources(self):
- return [ref for _, ref in self._list_refs_mtimes(self._basedir)]
-
# contains()
#
# Given a source, gets the ref name and checks whether the local CAS
@@ -325,9 +315,6 @@ class SourceCache(BaseCache):
return pushed_index and pushed_storage
- def _remove_source(self, ref, *, defer_prune=False):
- return self.cas.remove(ref, basedir=self._basedir, defer_prune=defer_prune)
-
def _store_source(self, ref, digest):
source_proto = source_pb2.Source()
source_proto.files.CopyFrom(digest)
@@ -353,21 +340,6 @@ class SourceCache(BaseCache):
def _source_path(self, ref):
return os.path.join(self._basedir, ref)
- def _reachable_directories(self):
- for root, _, files in os.walk(self._basedir):
- for source_file in files:
- source = source_pb2.Source()
- with open(os.path.join(root, source_file), "r+b") as f:
- source.ParseFromString(f.read())
-
- yield source.files
-
- def _update_mtime(self, ref):
- try:
- os.utime(self._source_path(ref))
- except FileNotFoundError as e:
- raise SourceCacheError("Couldn't find source: {}".format(ref)) from e
-
def _pull_source(self, source_ref, remote):
try:
remote.init()
diff --git a/src/buildstream/_state.py b/src/buildstream/_state.py
index d85e348f2..ec4f895fe 100644
--- a/src/buildstream/_state.py
+++ b/src/buildstream/_state.py
@@ -409,6 +409,3 @@ class _Task:
else:
new_progress = self.current_progress + 1
self.set_current_progress(new_progress)
-
- def add_maximum_progress(self):
- self.set_maximum_progress(self.maximum_progress or 0 + 1)
diff --git a/src/buildstream/sandbox/sandbox.py b/src/buildstream/sandbox/sandbox.py
index 071e23e84..f09aa03a0 100644
--- a/src/buildstream/sandbox/sandbox.py
+++ b/src/buildstream/sandbox/sandbox.py
@@ -587,26 +587,6 @@ class Sandbox:
def _get_element_name(self):
return self.__element_name
- # _callback()
- #
- # If this is called outside a batch context, the specified function is
- # invoked immediately.
- #
- # If this is called in a batch context, the function is added to the batch
- # for later invocation.
- #
- # Args:
- # callback (callable): The function to invoke
- #
- def _callback(self, callback):
- if self.__batch:
- batch_call = _SandboxBatchCall(callback)
-
- current_group = self.__batch.current_group
- current_group.append(batch_call)
- else:
- callback()
-
# _disable_run()
#
# Raise exception if `Sandbox.run()` is called. This enables use of
@@ -630,16 +610,6 @@ class Sandbox:
self._build_directory = directory
self._build_directory_always = always
- # _issue_warning()
- #
- # Issue warning with __context that is not available with subclasses
- #
- # Args:
- # message (str): A message to issue
- # details (str): optional, more detatils
- def _issue_warning(self, message, detail=None):
- self.__context.messenger.message(Message(MessageType.WARN, message, detail=detail))
-
# _SandboxBatch()
#
diff --git a/src/buildstream/storage/_casbaseddirectory.py b/src/buildstream/storage/_casbaseddirectory.py
index d6ebc6f75..46984041e 100644
--- a/src/buildstream/storage/_casbaseddirectory.py
+++ b/src/buildstream/storage/_casbaseddirectory.py
@@ -159,9 +159,6 @@ class CasBasedDirectory(Directory):
self.__invalidate_digest()
- def _copy_link_from_filesystem(self, basename, filename):
- self._add_new_link_direct(filename, os.readlink(os.path.join(basename, filename)))
-
def _add_new_link_direct(self, name, target):
self.index[name] = IndexEntry(name, _FileType.SYMLINK, target=target, modified=name in self.index)