juju-deployer

Merge lp:~jjo/juju-deployer/fix-diff-tags-logic-typo into lp:juju-deployer

  1. fix-diff-tags-logic-typo
  2. Merge into trunk
Proposed by JuanJo Ciarlante
Status: Merged
Merged at revision: 133
Proposed branch: lp:~jjo/juju-deployer/fix-diff-tags-logic-typo
Merge into: lp:juju-deployer
Diff against target: 12 lines (+1/-1)
1 file modified
deployer/action/diff.py (+1/-1)
To merge this branch: bzr merge lp:~jjo/juju-deployer/fix-diff-tags-logic-typo
Reviewer Review Type Date Requested Status
Kapil Thangavelu Approve
Review via email: mp+247723@code.launchpad.net

Commit message

[jjo] diff: fix typo when finding out if tags is a basestring

To post a comment you must log in.
Revision history for this message
Kapil Thangavelu (hazmat) wrote :

lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'deployer/action/diff.py'
2--- deployer/action/diff.py 2015-01-08 23:15:46 +0000
3+++ deployer/action/diff.py 2015-01-27 15:16:18 +0000
4@@ -125,7 +125,7 @@
5 d_sc = parse_constraints(d_s.get('constraints', ''))
6 # 'tags' is a special case, as it can be multi-valued: convert to list
7 # if cfg one is a string
8- if isinstance(d_sc.get('tag'), basestring):
9+ if isinstance(d_sc.get('tags'), basestring):
10 d_sc['tags'] = [d_sc['tags']]
11 if d_sc != e_s['constraints']:
12 mod['env-constraints'] = e_s['constraints']

Subscribers

People subscribed via source and target branches