Merge ~cjwatson/charms/+source/turnip:deploy-code-install-packages into ~canonical-launchpad-branches/charms/+source/turnip:master

Proposed by Colin Watson
Status: Merged
Approved by: Colin Watson
Approved revision: ff807590f26fb726c46dae01b9573bf20274a1ca
Merge reported by: Otto Co-Pilot
Merged at revision: not available
Proposed branch: ~cjwatson/charms/+source/turnip:deploy-code-install-packages
Merge into: ~canonical-launchpad-branches/charms/+source/turnip:master
Diff against target: 12 lines (+1/-0)
1 file modified
hooks/actions.py (+1/-0)
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+322684@code.launchpad.net

Commit message

Install packages before deploying code upgrades

Code upgrades may require us to have (for example) an upgraded libgit2,
so call install_packages first. For fresh deployments, this is a bit of
duplicated work but is harmless.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Self-approving as trivial.

review: Approve
Revision history for this message
Otto Co-Pilot (otto-copilot) wrote :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/hooks/actions.py b/hooks/actions.py
2index ed6557a..8b0c0c1 100644
3--- a/hooks/actions.py
4+++ b/hooks/actions.py
5@@ -164,6 +164,7 @@ def prune_payloads(keep):
6
7
8 def deploy_code(service_name):
9+ install_packages(service_name)
10 make_srv_location()
11
12 current_build_label = None

Subscribers

People subscribed via source and target branches