juju-deployer

Merge lp:~tvansteenburgh/juju-deployer/1463700 into lp:juju-deployer

  1. 1463700
  2. Merge into trunk
Proposed by Tim Van Steenburgh
Status: Rejected
Rejected by: Haw Loeung
Proposed branch: lp:~tvansteenburgh/juju-deployer/1463700
Merge into: lp:juju-deployer
Diff against target: 12 lines (+1/-1)
1 file modified
deployer/charm.py (+1/-1)
To merge this branch: bzr merge lp:~tvansteenburgh/juju-deployer/1463700
Reviewer Review Type Date Requested Status
Tom Haddon Abstain
juju-deployers Pending
Review via email: mp+267221@code.launchpad.net

Commit message

Make Charm.config return empty dict instead of None

Description of the change

Make Charm.config return {} instead of None

To post a comment you must log in.
Revision history for this message
🤖 Canonical IS Merge Bot (canonical-is-mergebot) wrote :

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

Revision history for this message
Tom Haddon (mthaddon) wrote :

Abstaining since this is so old, and the bug has been marked fix released.

review: Abstain

Unmerged revisions

153. By Tim Van Steenburgh

Make Charm.config return empty dict instead of None

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-06 16:44:32 +0000
4@@ -229,7 +229,7 @@
5 return {}
6
7 with open(config_path) as fh:
8- return yaml_load(fh.read()).get('options', {})
9+ return yaml_load(fh.read()).get('options') or {}
10
11 @property
12 def metadata(self):

Subscribers

People subscribed via source and target branches