Juju Charms Collection
core-image-watcher package

Merge lp:~fginther/charms/trusty/core-image-watcher/add-u-d-f into lp:~canonical-ci-engineering/charms/trusty/core-image-watcher/trunk

  1. Trusty Tahr (14.04)
  2. add-u-d-f
  3. Merge into trunk
Proposed by Francis Ginther
Status: Merged
Approved by: Celso Providelo
Approved revision: 3
Merged at revision: 3
Proposed branch: lp:~fginther/charms/trusty/core-image-watcher/add-u-d-f
Merge into: lp:~canonical-ci-engineering/charms/trusty/core-image-watcher/trunk
Diff against target: 20 lines (+2/-2)
1 file modified
hooks/actions.py (+2/-2)
To merge this branch: bzr merge lp:~fginther/charms/trusty/core-image-watcher/add-u-d-f
Reviewer Review Type Date Requested Status
Celso Providelo (community) Approve
Evan (community) Approve
Review via email: mp+254424@code.launchpad.net

Commit message

Add ubuntu-device-flash from ppa:canonical-ci-engineering/u-services.

Description of the change

Add ubuntu-device-flash from ppa:canonical-ci-engineering/u-services.

To post a comment you must log in.
Revision history for this message
Evan (ev) :
review: Approve
Revision history for this message
Celso Providelo (cprov) wrote :

Thanks for fixing this.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/actions.py'
2--- hooks/actions.py 2015-03-25 04:34:37 +0000
3+++ hooks/actions.py 2015-03-27 16:24:21 +0000
4@@ -11,7 +11,7 @@
5 SERVICE_NAME = 'core-image-watcher'
6 SERVICE_CONFIGNAME = 'core-service.conf'
7 REQUIRED_PACKAGES = [
8- 'python-virtualenv', 'python3-dev',
9+ 'python-virtualenv', 'python3-dev', 'ubuntu-device-flash',
10 ]
11
12 config = hookenv.config()
13@@ -33,7 +33,7 @@
14
15 def install_packages(service_name):
16 hookenv.log('Installing dependencies...')
17- fetch.add_source('ppa:canonical-ci-engineering/ci-airline-phase-0')
18+ fetch.add_source('ppa:canonical-ci-engineering/u-services')
19 fetch.configure_sources(update=True)
20 fetch.apt_install(REQUIRED_PACKAGES, fatal=True)
21

Subscribers

People subscribed via source and target branches