Make digital ocean handle errors a little better

alekibango · Dec 6, 2013 · 0656e10 · 0656e10
1 parent 870f150
commit 0656e10
Showing 1 changed file with 1 addition and 4 deletions.
diff --git a/salt/cloud/clouds/digital_ocean.py b/salt/cloud/clouds/digital_ocean.py
@@ -496,10 +496,7 @@ def query(method='droplets', droplet_id=None, command=None, args=None):
     result = json.loads(content)
     if result.get('status', '').lower() == 'error':
         raise SaltCloudSystemExit(
-            ''.join(
-                '{0}: {1}\n'.format(k, '\n'.join(v)) for (k, v) in
-                result.get('error_message', {}).items()
-            )
+            pprint.pformat(result.get('error_message', {}))
         )
 
     return result