diff options
author | bst-marge-bot <marge-bot@buildstream.build> | 2020-12-08 09:12:08 +0000 |
---|---|---|
committer | bst-marge-bot <marge-bot@buildstream.build> | 2020-12-08 09:12:08 +0000 |
commit | b6ea793df0180b0762891ac821b0d38d074edf9c (patch) | |
tree | 270efe83f874198eb09f5eaac8f411b2f2b2896c | |
parent | 642e423013e4e86a05f4f12c02bdb5883c6eafab (diff) | |
parent | 2b9fbf366d2ad3c23a9af7d85000c4f420628ae1 (diff) | |
download | buildstream-b6ea793df0180b0762891ac821b0d38d074edf9c.tar.gz |
Merge branch 'abderrahim/no-delete-extract' into 'master'
_context.py: don't delete bst1 extract directory
See merge request BuildStream/buildstream!2080
-rw-r--r-- | src/buildstream/_context.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/buildstream/_context.py b/src/buildstream/_context.py index 87b23d50c..34fc6f274 100644 --- a/src/buildstream/_context.py +++ b/src/buildstream/_context.py @@ -303,10 +303,9 @@ class Context: os.symlink(self.casdir, old_casdir) # Cleanup old extract directories - old_extractdirs = [os.path.join(self.cachedir, "artifacts", "extract"), os.path.join(self.cachedir, "extract")] - for old_extractdir in old_extractdirs: - if os.path.isdir(old_extractdir): - shutil.rmtree(old_extractdir, ignore_errors=True) + old_extractdir = os.path.join(self.cachedir, "extract") + if os.path.isdir(old_extractdir): + shutil.rmtree(old_extractdir, ignore_errors=True) # Load quota configuration # We need to find the first existing directory in the path of our |