diff options
| author | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2019-05-08 20:39:47 +0900 |
|---|---|---|
| committer | Tristan Van Berkom <tristan.vanberkom@codethink.co.uk> | 2019-05-08 20:41:45 +0900 |
| commit | 000ae7beabc0f85230f760a506f5f53779aa2701 (patch) | |
| tree | b492b97c8c65c34c45e4369c77bb0e93bed59fff | |
| parent | 5dad01068d3c662c335065015c770f8afc8d282f (diff) | |
| download | buildstream-000ae7beabc0f85230f760a506f5f53779aa2701.tar.gz | |
_loader/loader.py: Set junction to be required in order to resolve cache key
Recent code changes has avoided resolving cache keys in some conditions,
which causes loading to break when attempting to stage junctions in non-strict
mode.
Instead of calling Element._update_state() here to resolve the
cache key, setting it to be required causes it to automatically
have it's cache key resolved, solving the problem.
This change fixes #1018
| -rw-r--r-- | buildstream/_loader/loader.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/buildstream/_loader/loader.py b/buildstream/_loader/loader.py index 31d721b07..261ec40e4 100644 --- a/buildstream/_loader/loader.py +++ b/buildstream/_loader/loader.py @@ -564,7 +564,7 @@ class Loader(): basedir = sources[0]._get_local_path() else: # Stage sources - element._update_state() + element._set_required() basedir = os.path.join(self.project.directory, ".bst", "staged-junctions", filename, element._get_cache_key()) if not os.path.exists(basedir): |