From a906ebbd96cf3a022b489cc2c6aa1136e3c35af2 Mon Sep 17 00:00:00 2001 From: "Chris St. Pierre" Date: Fri, 22 Mar 2013 09:05:16 -0400 Subject: Executor: handle missing commands in a more backwards-compatible way --- src/lib/Bcfg2/Client/Tools/Portage.py | 5 +---- src/lib/Bcfg2/Client/Tools/__init__.py | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) (limited to 'src/lib/Bcfg2/Client') diff --git a/src/lib/Bcfg2/Client/Tools/Portage.py b/src/lib/Bcfg2/Client/Tools/Portage.py index d4373c299..6b38d7dec 100644 --- a/src/lib/Bcfg2/Client/Tools/Portage.py +++ b/src/lib/Bcfg2/Client/Tools/Portage.py @@ -29,10 +29,7 @@ class Portage(Bcfg2.Client.Tools.PkgTool): self._binpkgonly = self.setup.get('portage_binpkgonly', False) if self._binpkgonly: self.pkgtool = self._binpkgtool - try: - self.RefreshPackages() - except OSError: - raise Bcfg2.Client.Tools.ToolInstantiationError("equery not found") + self.RefreshPackages() def RefreshPackages(self): """Refresh memory hashes of packages.""" diff --git a/src/lib/Bcfg2/Client/Tools/__init__.py b/src/lib/Bcfg2/Client/Tools/__init__.py index e87d6e1d9..48fbbed52 100644 --- a/src/lib/Bcfg2/Client/Tools/__init__.py +++ b/src/lib/Bcfg2/Client/Tools/__init__.py @@ -561,10 +561,7 @@ class SvcTool(Tool): :returns: bool - True if the status command returned 0, False otherwise """ - try: - return bool(self.cmd.run(self.get_svc_command(service, 'status'))) - except OSError: - return False + return self.cmd.run(self.get_svc_command(service, 'status')).success def Remove(self, services): if self.setup['servicemode'] != 'disabled': -- cgit v1.2.3-1-g7c22