Merge lp:~clint-fewbar/pyjuju/0.6.1-maas-constraints into lp:pyjuju/0.6
Proposed by
Clint Byrum
Status: | Merged |
---|---|
Approved by: | Martin Packman |
Approved revision: | 595 |
Merged at revision: | 595 |
Proposed branch: | lp:~clint-fewbar/pyjuju/0.6.1-maas-constraints |
Merge into: | lp:pyjuju/0.6 |
Diff against target: |
16 lines (+3/-2) 1 file modified
juju/providers/maas/provider.py (+3/-2) |
To merge this branch: | bzr merge lp:~clint-fewbar/pyjuju/0.6.1-maas-constraints |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Martin Packman (community) | Approve | ||
Review via email: mp+132917@code.launchpad.net |
Description of the change
Stable backport of bug fix for maas constraints
Stable backport of bug fix for maas constraints
To post a comment you must log in.
Reviewers: mp+132917_ code.launchpad. net,
Message:
Please take a look.
Description:
Stable backport of bug fix for maas constraints
Stable backport of bug fix for maas constraints
https:/ /code.launchpad .net/~clint- fewbar/ juju/0. 6.1-maas- constraints/ +merge/ 132917
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/6815082/
Affected files: maas/provider. py
A [revision details]
M juju/providers/
Index: [revision details]
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: <email address hidden>
+New revision: <email address hidden>
Index: juju/providers/ maas/provider. py /maas/provider. py' maas/provider. py 2012-09-28 11:50:35 +0000 maas/provider. py 2012-11-05 15:54:50 +0000
"""Extract set of names in tag_expression checking they all replace( c, " ") strip() .split( ): expression. replace( c, " ") expression. strip() .split( ):
raise ValueError("tag %r does not exist" % (tag,))
=== modified file 'juju/providers
--- juju/providers/
+++ juju/providers/
@@ -37,9 +37,10 @@
def convert(self, tag_expression):
exist"""
tags = set()
+ stripped_expression = tag_expression
for c in (",", "&", "|", "!"):
- tag_expression = tag_expression.
- for word in tag_expression.
+ stripped_expression = stripped_
+ for word in stripped_
tag = word.lower()
if tag not in self.tag_names: