From 06d687a16c9250dd4d18bd7b4a2ab54d9ddde841 Mon Sep 17 00:00:00 2001 From: Darius Makovsky Date: Fri, 18 Oct 2019 10:12:27 +0100 Subject: local.py: use extended source api for staging --- src/buildstream/plugins/sources/local.py | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/buildstream/plugins/sources/local.py b/src/buildstream/plugins/sources/local.py index e28098c38..616ca39e9 100644 --- a/src/buildstream/plugins/sources/local.py +++ b/src/buildstream/plugins/sources/local.py @@ -92,19 +92,9 @@ class LocalSource(Source): # Nothing to do here for a local source pass # pragma: nocover - def stage(self, directory): - # directory should always be a Directory object - assert isinstance(directory, Directory) - with self.timed_activity("Staging local files into CAS"): - if os.path.isdir(self.fullpath) and not os.path.islink(self.fullpath): - result = directory.import_files(self.fullpath) - else: - result = directory.import_single_file(self.fullpath) - - if result.overwritten or result.ignored: - raise SourceError( - "Failed to stage source: files clash with existing directory", - reason='ensure-stage-dir-fail') + def stage(self, directory: Directory) -> None: + with self.timed_activity("Staging local files"): + self.stage_into_directory(self.fullpath, directory) def _get_local_path(self): return self.fullpath -- cgit v1.2.1