commit 6104174c220dfdb90d90276ea234ae6895d67ebc
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue Dec 8 10:04:09 2015 +0100
Move command availability detection code to common.util
python/javapackages/common/util.py | 6 ++++++
python/javapackages/xmvn/xmvn_resolve.py | 7 ++-----
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/python/javapackages/common/util.py b/python/javapackages/common/util.py
index b892bba..d9b349a 100644
--- a/python/javapackages/common/util.py
+++ b/python/javapackages/common/util.py
@@ -76,6 +76,12 @@ def execute_command(command, input=None):
return proc.returncode, stdout, stderr
+def command_exists(cmd):
+ command = "type {cmd}".format(cmd=cmd)
+ rc, _, _ = execute_command(command)
+ return True if not rc else False
+
+
def init_rpmgen(argv):
return _parse_rpmgen_args(argv)
diff --git a/python/javapackages/xmvn/xmvn_resolve.py
b/python/javapackages/xmvn/xmvn_resolve.py
index e47794d..970b916 100644
--- a/python/javapackages/xmvn/xmvn_resolve.py
+++ b/python/javapackages/xmvn/xmvn_resolve.py
@@ -33,7 +33,7 @@
import os
import lxml.etree
-from javapackages.common.util import execute_command
+from javapackages.common.util import execute_command, command_exists
from javapackages.common.exception import JavaPackagesToolsException
@@ -51,10 +51,7 @@ class XMvnResolve(object):
# always return True if running in test environment
if os.environ.get("JAVAPACKAGES_XMVN_RESOLVE_TEST", None) is not None:
return True
-
- command = "type {tool}".format(tool=XMvnResolve.tool)
- rc, _, _ = execute_command(command)
- return True if not rc else False
+ return command_exists(XMvnResolve.tool)
@staticmethod
def process_raw_request(raw_request_list):
Show replies by date