diff options
author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-04-16 18:39:26 +0100 |
---|---|---|
committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-04-16 18:56:30 +0100 |
commit | acd7efd8bda7e9f76d8a5513eb398b9e5832ada2 (patch) | |
tree | 71eeaefe7a4c8d7c6c5857ae05d68dce595cd286 | |
parent | 1898a9de4bc78a909e6dcec8599f30d75f932b47 (diff) | |
download | morph-acd7efd8bda7e9f76d8a5513eb398b9e5832ada2.tar.gz |
Remove duplicated function _artifact_filename
-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 da9e97c1..1f91cd79 100644 --- a/distbuild/build_controller.py +++ b/distbuild/build_controller.py @@ -309,12 +309,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() @@ -324,7 +318,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) @@ -344,7 +338,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']: |