diff options
Diffstat (limited to 'morphlib/plugins/deploy_plugin.py')
| -rw-r--r-- | morphlib/plugins/deploy_plugin.py | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/morphlib/plugins/deploy_plugin.py b/morphlib/plugins/deploy_plugin.py index 38c17bc2..99ca6fc3 100644 --- a/morphlib/plugins/deploy_plugin.py +++ b/morphlib/plugins/deploy_plugin.py @@ -322,27 +322,31 @@ class DeployPlugin(cliapp.Plugin): bb = morphlib.buildbranch.BuildBranch(sb, build_ref_prefix, push_temporary=False) with contextlib.closing(bb) as bb: - - for gd, build_ref in bb.add_uncommitted_changes(): + def report_add(gd, build_ref, changed): self.app.status(msg='Adding uncommitted changes '\ 'in %(dirname)s to %(ref)s', dirname=gd.dirname, ref=build_ref, chatty=True) + bb.add_uncommitted_changes(add_cb=report_add) - for gd in bb.inject_build_refs(loader): + def report_inject(gd): self.app.status(msg='Injecting temporary build refs '\ 'into morphologies in %(dirname)s', dirname=gd.dirname, chatty=True) + bb.inject_build_refs(loader, inject_cb=report_inject) - for gd, build_ref in bb.update_build_refs(name, email, build_uuid): + def report_commit(gd, build_ref): self.app.status(msg='Committing changes in %(dirname)s '\ 'to %(ref)s', dirname=gd.dirname, ref=build_ref, chatty=True) + bb.update_build_refs(name, email, build_uuid, + commit_cb=report_commit) - for gd, build_ref, remote in bb.push_build_branches(): + def report_push(gd, build_ref, remote, refspec): self.app.status(msg='Pushing %(ref)s in %(dirname)s '\ 'to %(remote)s', ref=build_ref, dirname=gd.dirname, remote=remote.get_push_url(), chatty=True) + bb.push_build_branches(push_cb=report_push) # Create a tempdir for this deployment to work in deploy_tempdir = tempfile.mkdtemp( |