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

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
=== added file '.bzrignore'
--- .bzrignore 1970-01-01 00:00:00 +0000
+++ .bzrignore 2014-07-16 08:35:25 +0000
@@ -0,0 +1,1 @@
1bin/
02
=== modified file 'Makefile'
--- Makefile 2013-08-29 13:18:55 +0000
+++ Makefile 2014-07-16 08:35:25 +0000
@@ -1,8 +1,14 @@
1#!/usr/bin/make1#!/usr/bin/make
2PYTHON := /usr/bin/env python
23
3lint:4lint:
4 @flake8 --exclude hooks/charmhelpers hooks5 @flake8 --exclude hooks/charmhelpers hooks
5 @charm proof6 @charm proof
67
7sync:8bin/charm_helpers_sync.py:
8 @charm-helper-sync -c charm-helpers-sync.yaml9 @mkdir -p bin
10 @bzr cat lp:charm-helpers/tools/charm_helpers_sync/charm_helpers_sync.py \
11 > bin/charm_helpers_sync.py
12
13sync: bin/charm_helpers_sync.py
14 @$(PYTHON) bin/charm_helpers_sync.py -c charm-helpers-sync.yaml

Subscribers

People subscribed via source and target branches

to all changes: