juju-deployer

Merge lp:~hopem/juju-deployer/lp1391889 into lp:juju-deployer

  1. lp1391889
  2. Merge into trunk
Proposed by Edward Hope-Morley
Status: Merged
Approved by: Kapil Thangavelu
Approved revision: 147
Merged at revision: 153
Proposed branch: lp:~hopem/juju-deployer/lp1391889
Merge into: lp:juju-deployer
Diff against target: 13 lines (+2/-1)
1 file modified
deployer/charm.py (+2/-1)
To merge this branch: bzr merge lp:~hopem/juju-deployer/lp1391889
Reviewer Review Type Date Requested Status
Kapil Thangavelu Approve
Review via email: mp+263241@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Kapil Thangavelu (hazmat) wrote :

lgtm

review: Approve
Revision history for this message
Edward Hope-Morley (hopem) wrote :

Can we land this now?

lp:~hopem/juju-deployer/lp1391889 updated
148. By Edward Hope-Morley

rebase

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deployer/charm.py'
2--- deployer/charm.py 2015-08-04 12:50:12 +0000
3+++ deployer/charm.py 2015-08-20 15:22:16 +0000
4@@ -86,7 +86,8 @@
5 cls.log.error(
6 "Service: %s has both charm url: %s and branch: %s specified",
7 name, store_url, branch)
8- if not store_url and not branch and not os.path.isabs(name):
9+ if not (store_url or branch or os.path.isabs(name) or
10+ name.startswith('local:')):
11 cls.log.error(
12 "Service: %s has neither charm url or branch specified",
13 name)

Subscribers

People subscribed via source and target branches