User cmd.run_all (I misread cmd.run)

basepi · basepi · commit d273217d78a0 · 2013-03-14T12:55:23.000-06:00
Also, because of my misreading of cmd.run, my previous comment about
dpkg.py not working was incorrect.
diff --git a/salt/modules/apt.py b/salt/modules/apt.py
@@ -102,7 +102,7 @@ def available_version(*names, **kwargs):
         if fromrepo else ''
     for name in names:
         cmd = 'apt-cache -q policy {0}{1} | grep Candidate'.format(name, repo)
-        out = __salt__['cmd.run'](cmd)
+        out = __salt__['cmd.run_all'](cmd)
         if out['retcode'] != 0:
             msg = 'Error:  ' + out['stderr']
             log.error(msg)
@@ -336,7 +336,7 @@ def remove(pkg, **kwargs):
             log.exception(e)
 
     cmd = 'apt-get -q -y remove {0}'.format(pkg)
-    out = __salt__['cmd.run'](cmd)
+    out = __salt__['cmd.run_all'](cmd)
     if out['retcode'] != 0:
         msg = 'Error:  ' + out['stderr']
         log.error(msg)
@@ -372,7 +372,7 @@ def purge(pkg, **kwargs):
 
     # Remove inital package
     purge_cmd = 'apt-get -q -y purge {0}'.format(pkg)
-    out = __salt__['cmd.run'](purge_cmd)
+    out = __salt__['cmd.run_all'](purge_cmd)
     if out['retcode'] != 0:
         msg = 'Error:  ' + out['stderr']
         log.error(msg)
@@ -413,7 +413,7 @@ def upgrade(refresh=True, **kwargs):
     old_pkgs = list_pkgs()
     cmd = ('apt-get -q -y -o DPkg::Options::=--force-confold '
            '-o DPkg::Options::=--force-confdef dist-upgrade')
-    out = __salt__['cmd.run'](cmd)
+    out = __salt__['cmd.run_all'](cmd)
     if out['retcode'] != 0:
         msg = 'Error:  ' + out['stderr']
         log.error(msg)
@@ -459,7 +459,7 @@ def list_pkgs(regex_string=''):
         )
     )
 
-    out = __salt__['cmd.run'](cmd)
+    out = __salt__['cmd.run_all'](cmd)
     if out['retcode'] != 0:
         msg = 'Error:  ' + out['stderr']
         log.error(msg)
@@ -506,7 +506,7 @@ def _get_upgradable():
     '''
 
     cmd = 'apt-get --just-print dist-upgrade'
-    out = __salt__['cmd.run'](cmd)
+    out = __salt__['cmd.run_all'](cmd)
     if out['retcode'] != 0:
         msg = 'Error:  ' + out['stderr']
         log.error(msg)
diff --git a/salt/modules/dpkg.py b/salt/modules/dpkg.py
@@ -34,7 +34,7 @@ def list_pkgs(*packages):
     '''
     pkgs = {}
     cmd = 'dpkg -l {0}'.format(' '.join(packages))
-    out = __salt__['cmd.run'](cmd)
+    out = __salt__['cmd.run_all'](cmd)
     if out['retcode'] != 0:
         msg = 'Error:  ' + out['stderr']
         log.error(msg)
@@ -64,7 +64,7 @@ def file_list(*packages):
     ret = set([])
     pkgs = {}
     cmd = 'dpkg -l {0}'.format(' '.join(packages))
-    out = __salt__['cmd.run'](cmd)
+    out = __salt__['cmd.run_all'](cmd)
     if out['retcode'] != 0:
         msg = 'Error:  ' + out['stderr']
         log.error(msg)
@@ -104,6 +104,7 @@ def file_dict(*packages):
     ret = {}
     pkgs = {}
     cmd = 'dpkg -l {0}'.format(' '.join(packages))
+    out = __salt__['cmd.run_all'](cmd)
     if out['retcode'] != 0:
         msg = 'Error:  ' + out['stderr']
         log.error(msg)
