Merge pull request #24490 from aneeshusa/fix-pacman-list-upgrades

Fix pacman.list_upgrades for new python_shell default.
saltstack · Jun 9, 2015 · 0247e8d · 0247e8d
2 parents 6268ddb + 980e1cb
commit 0247e8d
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/salt/modules/pacman.py b/salt/modules/pacman.py
@@ -126,10 +126,7 @@ def list_upgrades(refresh=False):
     if refresh:
         options.append('-y')
 
-    cmd = (
-        'pacman {0} | egrep -v '
-        r'"^\s|^:"'
-    ).format(' '.join(options))
+    cmd = ('pacman {0}').format(' '.join(options))
 
     call = __salt__['cmd.run_all'](cmd, output_loglevel='trace')
 
@@ -145,7 +142,9 @@ def list_upgrades(refresh=False):
     else:
         out = call['stdout']
 
-    for line in out.splitlines():
+    output = iter(out.splitlines())
+    output.next()  # Skip informational output line
+    for line in output:
         comps = line.split(' ')
         if len(comps) < 2:
             continue