Use machine readable output for list

This actually fixes the issue in saltstack#38290 while the other change should improve the output for the states.
dragon788 · Dec 16, 2016 · 1f5fc17 · 1f5fc17
1 parent cdbd2fb
commit 1f5fc17
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/salt/modules/chocolatey.py b/salt/modules/chocolatey.py
@@ -255,6 +255,7 @@ def list_(narrow=None,
         cmd.extend(['-source', source])
     if local_only:
         cmd.extend(['-localonly'])
+        cmd.extend(['-limitoutput'])
 
     result = __salt__['cmd.run_all'](cmd, python_shell=False)
 
@@ -264,7 +265,7 @@ def list_(narrow=None,
         raise CommandExecutionError(err)
 
     ret = {}
-    pkg_re = re.compile(r'(\S+)\s+(\S+)')
+    pkg_re = re.compile(r'(\S+)\|(\S+)')
     for line in result['stdout'].split('\n'):
         if line.startswith("No packages"):
             return ret