commit 2942eef53835ae400ff022f4dccbdd6c09959aef Author: Michal Srb msrb@redhat.com Date: Thu Dec 4 17:42:54 2014 +0100
[xmvn_resolve] Run in shell
etc/javapackages-config.json | 3 --- python/javapackages/xmvn/xmvn_resolve.py | 30 ++++++++++-------------------- 2 files changed, 10 insertions(+), 23 deletions(-) --- diff --git a/etc/javapackages-config.json b/etc/javapackages-config.json index d373449..a1a770d 100644 --- a/etc/javapackages-config.json +++ b/etc/javapackages-config.json @@ -19,7 +19,4 @@ "jpackage-utils" ] }, - "xmvn-resolve": { - "path": "/usr/bin/xmvn-resolve" - } } diff --git a/python/javapackages/xmvn/xmvn_resolve.py b/python/javapackages/xmvn/xmvn_resolve.py index 52799ea..13a7537 100644 --- a/python/javapackages/xmvn/xmvn_resolve.py +++ b/python/javapackages/xmvn/xmvn_resolve.py @@ -31,44 +31,34 @@ # Authors: Michal Srb msrb@redhat.com
import lxml.etree -import os
-from javapackages.common.config import get_configs from javapackages.common.util import execute_command
class XMvnResolve(object): # TODO: # - documentation + tool = "xmvn-resolve"
@staticmethod - def is_available(): - return os.path.exists(XMvnResolve._load_path_from_config()) + def is_available(scl=None): + command = "type {tool}".format(tool=XMvnResolve.tool) + rc, _, _ = execute_command(command, shell=True, enable_scl=scl) + return True if not rc else False
@staticmethod def process_raw_request(raw_request_list, scl=None): - binpath = XMvnResolve._load_path_from_config() request = XMvnResolve._join_raw_requests(raw_request_list) - rc, stdout, stderr = execute_command(binpath, args=["--raw-request"], - input=request, enable_scl=scl) + rc, stdout, stderr = execute_command(XMvnResolve.tool, + args=["--raw-request"], + shell=True, + input=request, + enable_scl=scl)
result = XMvnResolve._process_results(stdout) return result
@staticmethod - def _load_path_from_config(): - configs = get_configs() - path = None - for config in configs: - path = config.get('path', "") - if os.path.exists(path): - break - if not path: - # default path - path = "/usr/bin/xmvn-resolve" - return path - - @staticmethod def _join_raw_requests(raw_request_list): request = "<requests>" for r in raw_request_list:
java-sig-commits@lists.fedoraproject.org