Juju Charms Collection
ntp package

Merge lp:~tribaal/charms/trusty/ntp/ntp-add-charmhelper-sync-trick into lp:charms/trusty/ntp

  1. Trusty Tahr (14.04)
  2. ntp-add-charmhelper-sync-trick
  3. Merge into trunk
Proposed by Chris Glass
Status: Merged
Merged at revision: 15
Proposed branch: lp:~tribaal/charms/trusty/ntp/ntp-add-charmhelper-sync-trick
Merge into: lp:charms/trusty/ntp
Diff against target: 26 lines (+9/-2)
2 files modified
.bzrignore (+1/-0)
Makefile (+8/-2)
To merge this branch: bzr merge lp:~tribaal/charms/trusty/ntp/ntp-add-charmhelper-sync-trick
Reviewer Review Type Date Requested Status
Liam Young (community) Approve
Review via email: mp+226976@code.launchpad.net

Description of the change

This branch changes only the Makefile to add a more clever "sync" target, that will automagically update charmhelpers (as is standard in openstack charms).

Original inspiration: https://bazaar.launchpad.net/~james-page/charms/trusty/keystone/network-splits/view/head:/Makefile

To post a comment you must log in.
Revision history for this message
Liam Young (gnuoy) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file '.bzrignore'
2--- .bzrignore 1970-01-01 00:00:00 +0000
3+++ .bzrignore 2014-07-16 08:35:25 +0000
4@@ -0,0 +1,1 @@
5+bin/
6
7=== modified file 'Makefile'
8--- Makefile 2013-08-29 13:18:55 +0000
9+++ Makefile 2014-07-16 08:35:25 +0000
10@@ -1,8 +1,14 @@
11 #!/usr/bin/make
12+PYTHON := /usr/bin/env python
13
14 lint:
15 @flake8 --exclude hooks/charmhelpers hooks
16 @charm proof
17
18-sync:
19- @charm-helper-sync -c charm-helpers-sync.yaml
20+bin/charm_helpers_sync.py:
21+ @mkdir -p bin
22+ @bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
23+ > bin/charm_helpers_sync.py
24+
25+sync: bin/charm_helpers_sync.py
26+ @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-sync.yaml

Subscribers

People subscribed via source and target branches

to all changes: