From e410e860c7c4e95d70604d172b9b7b87f956a033 Mon Sep 17 00:00:00 2001 From: Darius Makovsky Date: Tue, 24 Dec 2019 09:41:38 +0000 Subject: _casbaseddirectory: remove unused _copy_link_from_filesystem --- src/buildstream/storage/_casbaseddirectory.py | 3 --- 1 file changed, 3 deletions(-) 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) -- cgit v1.2.1 From dc984ff5a28fb2d502457722c8805b59ab34b965 Mon Sep 17 00:00:00 2001 From: Darius Makovsky Date: Tue, 24 Dec 2019 09:43:30 +0000 Subject: sandbox: remove unused _callback --- src/buildstream/sandbox/sandbox.py | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/buildstream/sandbox/sandbox.py b/src/buildstream/sandbox/sandbox.py index 071e23e84..61f5e349b 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 -- cgit v1.2.1 From 98d9e0620ebe62dafcc34a1bbcac809673522fa7 Mon Sep 17 00:00:00 2001 From: Darius Makovsky Date: Tue, 24 Dec 2019 09:44:50 +0000 Subject: sandbox: remove unused _issue_warning --- src/buildstream/sandbox/sandbox.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/buildstream/sandbox/sandbox.py b/src/buildstream/sandbox/sandbox.py index 61f5e349b..f09aa03a0 100644 --- a/src/buildstream/sandbox/sandbox.py +++ b/src/buildstream/sandbox/sandbox.py @@ -610,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() # -- cgit v1.2.1 From 10d35a0405982f2117d23a4c368562ba6c18dc97 Mon Sep 17 00:00:00 2001 From: Darius Makovsky Date: Tue, 24 Dec 2019 11:04:16 +0000 Subject: _sourcecache: remove unused list_sources --- src/buildstream/_sourcecache.py | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/buildstream/_sourcecache.py b/src/buildstream/_sourcecache.py index 221694e94..85e9dd65b 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 -- cgit v1.2.1 From ed047c324e076d92c177038e21d0344e489c66a4 Mon Sep 17 00:00:00 2001 From: Darius Makovsky Date: Tue, 24 Dec 2019 11:04:52 +0000 Subject: _sourcecache: remove unused _remove_source --- src/buildstream/_sourcecache.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/buildstream/_sourcecache.py b/src/buildstream/_sourcecache.py index 85e9dd65b..787f20d23 100644 --- a/src/buildstream/_sourcecache.py +++ b/src/buildstream/_sourcecache.py @@ -315,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) -- cgit v1.2.1 From 7636b6b36fa66286ecea0668824dbcd21566fae2 Mon Sep 17 00:00:00 2001 From: Darius Makovsky Date: Tue, 24 Dec 2019 11:05:26 +0000 Subject: _sourcecache: remove unused _reachable_directories --- src/buildstream/_sourcecache.py | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/buildstream/_sourcecache.py b/src/buildstream/_sourcecache.py index 787f20d23..ad0704d89 100644 --- a/src/buildstream/_sourcecache.py +++ b/src/buildstream/_sourcecache.py @@ -340,15 +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)) -- cgit v1.2.1 From ef76f45d14e9604570b196e338e1ce0492bccb97 Mon Sep 17 00:00:00 2001 From: Darius Makovsky Date: Tue, 24 Dec 2019 11:05:50 +0000 Subject: _sourcecache: remove unused _update_mtime --- src/buildstream/_sourcecache.py | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/buildstream/_sourcecache.py b/src/buildstream/_sourcecache.py index ad0704d89..e485fbd47 100644 --- a/src/buildstream/_sourcecache.py +++ b/src/buildstream/_sourcecache.py @@ -340,12 +340,6 @@ class SourceCache(BaseCache): def _source_path(self, ref): return os.path.join(self._basedir, ref) - 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() -- cgit v1.2.1 From a44c2eb805acb51c66bb831e9578e6b765850d0c Mon Sep 17 00:00:00 2001 From: Darius Makovsky Date: Tue, 24 Dec 2019 11:08:20 +0000 Subject: _state: remove unused add_maximum_progress --- src/buildstream/_state.py | 3 --- 1 file changed, 3 deletions(-) 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) -- cgit v1.2.1