Merge ~johnsca/juju-wait:bug/retry-config into juju-wait:master

[Cory Johns]

The model config was not being read properly because of a trailing newline.

[Stuart Bishop (stub)]

It's attempting to run juju model-config before the version check, and that will fail with Juju 1.x

review: Needs Fixing

[Stuart Bishop (stub)]

This sort of bug is why it is preferable to decode yaml or json. But this seems fine for now.

review: Approve

diff --git a/juju_wait/__init__.py b/juju_wait/__init__.py
index 3917148..f359815 100755
--- a/juju_wait/__init__.py
+++ b/juju_wait/__init__.py
@@ -247,7 +247,8 @@ def wait_cmd(args=sys.argv[1:]):
         if juju('version').startswith('1.'):
             logging.warning('Ignoring --retry_errors on Juju 1.x')
             args.retry_errors = 0
-        elif juju('model-config', 'automatically-retry-hooks') != 'True':
+        elif juju('model-config',
+                  'automatically-retry-hooks').strip() != 'True':
             logging.warning('Ignoring --retry_errors when retries disabled')
             args.retry_errors = 0