juju-deployer

Merge lp:~thomir-deactivatedaccount/juju-deployer/trunk-remove-charm-error into lp:juju-deployer

  1. trunk-remove-charm-error
  2. Merge into trunk
Proposed by Thomi Richards
Status: Merged
Merged at revision: 157
Proposed branch: lp:~thomir-deactivatedaccount/juju-deployer/trunk-remove-charm-error
Merge into: lp:juju-deployer
Diff against target: 17 lines (+1/-6)
1 file modified
deployer/charm.py (+1/-6)
To merge this branch: bzr merge lp:~thomir-deactivatedaccount/juju-deployer/trunk-remove-charm-error
Reviewer Review Type Date Requested Status
Tim Van Steenburgh (community) Approve
Review via email: mp+271368@code.launchpad.net

Description of the change

Remove spurious error message.

To post a comment you must log in.
Revision history for this message
Tim Van Steenburgh (tvansteenburgh) :
review: Approve

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-20 15:22:05 +0000
3+++ deployer/charm.py 2015-09-16 19:55:37 +0000
4@@ -86,12 +86,7 @@
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 or branch or os.path.isabs(name) or
9- name.startswith('local:')):
10- cls.log.error(
11- "Service: %s has neither charm url or branch specified",
12- name)
13- elif not store_url:
14+ if not store_url:
15 build = data.get('build', '')
16
17 return cls(name, charm_path, branch, rev, build, store_url)

Subscribers

People subscribed via source and target branches

to all changes: