Fixes for juju-dhx for 2.0rc2 #70

johnsca · Oct 4, 2016

No description provided.

chuckbutler · Oct 12, 2016

Aside from my comments about anecdotal reactions, i've pulled this branch and tested its basic functionality on 2.0-rc3.

👍 LGTM

praise the sun, we get to ditch the funky splits \o/

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.

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.

I assume this was early beta format?

Indeed.

Fixes for juju-dhx for 2.0rc2

bca5c57

chuckbutler merged commit 38bb5eb into juju:master Oct 12, 2016

@@ -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')

-        -    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

              return get_env._env
          def _unit_errored(unit):
              if JUJU_2:
-        -        return unit['WorkloadStatus']['Status'] == 'error'

juju/plugins