diff options
Diffstat (limited to 'distbuild')
| -rw-r--r-- | distbuild/build_controller.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/distbuild/build_controller.py b/distbuild/build_controller.py index f596a295..a3911586 100644 --- a/distbuild/build_controller.py +++ b/distbuild/build_controller.py @@ -321,12 +321,6 @@ class BuildController(distbuild.StateMachine): notify_success(artifact) - def _artifact_filename(self, artifact): - return ('%s.%s.%s' % - (artifact.cache_key, - artifact.source.morphology['kind'], - artifact.name)) - def _start_annotating(self, event_source, event): distbuild.crash_point() @@ -336,7 +330,7 @@ class BuildController(distbuild.StateMachine): def set_state_and_append(artifact): artifact.state = UNKNOWN - artifact_names.append(self._artifact_filename(artifact)) + artifact_names.append(artifact.basename()) map_build_graph(self._artifact, set_state_and_append) @@ -356,7 +350,7 @@ class BuildController(distbuild.StateMachine): def _maybe_handle_cache_response(self, event_source, event): def set_status(artifact): - is_in_cache = cache_state[self._artifact_filename(artifact)] + is_in_cache = cache_state[artifact.basename()] artifact.state = BUILT if is_in_cache else UNBUILT if self._helper_id != event.msg['id']: |