diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-03-27 11:13:30 +0000 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-03-27 11:13:30 +0000 |
| commit | f56259c2ce62c301f0e0f9dd7c85001b45fc8f5c (patch) | |
| tree | bdf2e7ad0985212e306d5b970c0999087b81f91b /morphlib/plugins/deploy_plugin.py | |
| parent | 170d81eba0568856401f57ce655ad9881b802d21 (diff) | |
| parent | 9cbf777d614b8f240ccaa0203e7e3ba40b487f11 (diff) | |
| download | morph-f56259c2ce62c301f0e0f9dd7c85001b45fc8f5c.tar.gz | |
Merge branch 'baserock/richardipsum/merge_distbuild'
Conflicts:
morphlib/plugins/deploy_plugin.py
without-test-modules
Reviewed by:
Richard Maw
Lars Wirzenius
Diffstat (limited to 'morphlib/plugins/deploy_plugin.py')
| -rw-r--r-- | morphlib/plugins/deploy_plugin.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py index cc2076cd..ae62b75d 100644 --- a/morphlib/plugins/deploy_plugin.py +++ b/morphlib/plugins/deploy_plugin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2013-2014 Codethink Limited +# Copyright (C) 2013, 2014 Codethink Limited # # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -444,7 +444,8 @@ class DeployPlugin(cliapp.Plugin): if build_command.lac.has(artifact): f = build_command.lac.get(artifact) elif build_command.rac.has(artifact): - f = build_command.rac.get(artifact) + build_command.cache_artifacts_locally([artifact]) + f = build_command.lac.get(artifact) else: raise cliapp.AppException('Deployment failed as system is' ' not yet built.\nPlease ensure' |