66ae6bcfbd
Update to 2016.11.2 version, bugfixes OBS-URL: https://build.opensuse.org/request/show/458508 OBS-URL: https://build.opensuse.org/package/show/systemsmanagement:saltstack/salt?expand=0&rev=85
27 lines
721 B
Diff
27 lines
721 B
Diff
From 7c459f38d43ef31ededce703fbfb432af1fdcee6 Mon Sep 17 00:00:00 2001
|
|
From: Michael Calmer <mc@suse.de>
|
|
Date: Sat, 4 Feb 2017 16:05:45 +0100
|
|
Subject: [PATCH] fix error parsing
|
|
|
|
---
|
|
salt/modules/dockerng.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/salt/modules/dockerng.py b/salt/modules/dockerng.py
|
|
index f29108f1ba..cbf2a6b397 100644
|
|
--- a/salt/modules/dockerng.py
|
|
+++ b/salt/modules/dockerng.py
|
|
@@ -1204,7 +1204,7 @@ def _error_detail(data, item):
|
|
'''
|
|
err = item['errorDetail']
|
|
if 'code' in err:
|
|
- msg = '{1}: {2}'.format(
|
|
+ msg = '{0}: {1}'.format(
|
|
item['errorDetail']['code'],
|
|
item['errorDetail']['message'],
|
|
)
|
|
--
|
|
2.11.0
|
|
|
|
|