From ff8ab8237b0ee72cc5f5936231fdd7d0863138ed Mon Sep 17 00:00:00 2001
From: "Chris St. Pierre" <chris.a.st.pierre@gmail.com>
Date: Thu, 21 Mar 2013 17:52:53 -0400
Subject: Client: fix some OSError tracebacks from commands not found

---
 src/lib/Bcfg2/Client/Tools/Portage.py  |  8 ++++++--
 src/lib/Bcfg2/Client/Tools/RcUpdate.py | 12 ++++++------
 src/lib/Bcfg2/Utils.py                 |  2 +-
 3 files changed, 13 insertions(+), 9 deletions(-)

(limited to 'src/lib')

diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py
index 6cbcff2e0..d4373c299 100644
--- a/src/lib/Bcfg2/Client/Tools/Portage.py
+++ b/src/lib/Bcfg2/Client/Tools/Portage.py
@@ -29,7 +29,10 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
         self._binpkgonly = self.setup.get('portage_binpkgonly', False)
         if self._binpkgonly:
             self.pkgtool = self._binpkgtool
-        self.RefreshPackages()
+        try:
+            self.RefreshPackages()
+        except OSError:
+            raise Bcfg2.Client.Tools.ToolInstantiationError("equery not found")
 
     def RefreshPackages(self):
         """Refresh memory hashes of packages."""
@@ -37,7 +40,8 @@ class Portage(Bcfg2.Client.Tools.PkgTool):
             return
         self.logger.info('Getting list of installed packages')
         self.installed = {}
-        for pkg in self.cmd.run("equery -q list '*'").stdout.splitlines():
+        for pkg in self.cmd.run(["equery", "-q",
+                                 "list", "*"]).stdout.splitlines():
             if self._pkg_pattern.match(pkg):
                 name = self._pkg_pattern.match(pkg).group(1)
                 version = self._pkg_pattern.match(pkg).group(2)
diff --git a/src/lib/Bcfg2/Client/Tools/RcUpdate.py b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
index 2e58f2564..552b27842 100644
--- a/src/lib/Bcfg2/Client/Tools/RcUpdate.py
+++ b/src/lib/Bcfg2/Client/Tools/RcUpdate.py
@@ -22,8 +22,8 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
             return True
 
         # check if service is enabled
-        cmd = '/sbin/rc-update show default | grep %s'
-        is_enabled = self.cmd.run(cmd % entry.get('name')).success
+        result = self.cmd.run(["/sbin/rc-update", "show", "default"])
+        is_enabled = entry.get("name") in result.stdout
 
         # check if init script exists
         try:
@@ -34,8 +34,8 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
             return False
 
         # check if service is enabled
-        cmd = '/etc/init.d/%s status | grep started'
-        is_running = self.cmd.run(cmd % entry.attrib['name']).success
+        result = self.cmd.run(self.get_svc_command(entry, "status"))
+        is_running = "started" in result.stdout
 
         if entry.get('status') == 'on' and not (is_enabled and is_running):
             entry.set('current_status', 'off')
@@ -70,9 +70,9 @@ class RcUpdate(Bcfg2.Client.Tools.SvcTool):
 
     def FindExtra(self):
         """Locate extra rc-update services."""
-        cmd = '/bin/rc-status -s'
         allsrv = [line.split()[0]
-                  for line in self.cmd.run(cmd).stdout.splitlines()
+                  for line in self.cmd.run(['/bin/rc-status',
+                                            '-s']).stdout.splitlines()
                   if 'started' in line]
         self.logger.debug('Found active services:')
         self.logger.debug(allsrv)
diff --git a/src/lib/Bcfg2/Utils.py b/src/lib/Bcfg2/Utils.py
index 7d7d26d5d..4e2deb92e 100644
--- a/src/lib/Bcfg2/Utils.py
+++ b/src/lib/Bcfg2/Utils.py
@@ -197,7 +197,7 @@ class Executor(object):
         :type timeout: float
         :returns: :class:`Bcfg2.Utils.ExecutorResult`
         """
-        if isinstance(command, str):
+        if isinstance(command, basestring):
             cmdstr = command
         else:
             cmdstr = " ".join(command)
-- 
cgit v1.2.3-1-g7c22