Fixes for juju-dhx for 2.0rc2 #70
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lazypower
approved these changes
Oct 12, 2016
| return get_env._env | ||
|
|
||
|
|
||
| def _unit_errored(unit): | ||
| if JUJU_2: | ||
| return unit['WorkloadStatus']['Status'] == 'error' |
There was a problem hiding this comment.
I assume this was early beta format?
| @@ -32,11 +34,29 @@ def call(*args): | |||
| sys.exit(e.returncode) | |||
|
|
|||
|
|
|||
| JUJU_ENV = call('juju', 'switch').rstrip('\n').split(':')[-1] | |||
| JUJU_ENV = call('juju', 'switch').rstrip('\n') | |||
There was a problem hiding this comment.
praise the sun, we get to ditch the funky splits \o/
| annotations = env.get_annotation(machine, 'machine') | ||
| if annotations['Annotations'].get('import-ids') != ','.join(import_ids): | ||
| annotations = env.get_annotation(machine, 'machine')['Annotations'] or {} | ||
| import_ids = ['lp:{}'.format(iid) if ':' not in iid else iid |
There was a problem hiding this comment.
this line makes my head explode. 💣 I was looking for where iid is declared, and its on 208. Using a variable before assignment... oh my lambda.
There was a problem hiding this comment.
Yeah, that's a bit of an annoyance when you have to line-break list comprehensions. This might have been marginally clearer using map() instead.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.