commit 5df2e90f89197f0dcf26d30b6c30b77475617bf2
Author: Michal Srb <msrb(a)redhat.com>
Date: Fri Nov 28 13:45:00 2014 +0100
SCL-ize calls to xmvn-resolve
depgenerators/maven.req | 4 ++--
python/javapackages/xmvn/xmvn_resolve.py | 18 ++++++++++--------
2 files changed, 12 insertions(+), 10 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 8837f04..7f97480 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -278,7 +278,7 @@ class TagBuilder(object):
version=dep.requestedVersion)
requests.append(request)
if requests:
- results = XMvnResolve.process_raw_request(requests)
+ results = XMvnResolve.process_raw_request(requests, rpmconf.scl)
for i, r in enumerate(results):
if not r:
unresolvable.append(deps[i])
@@ -307,7 +307,7 @@ class TagBuilder(object):
reqs = []
for d in deps:
reqs.append(ResolutionRequest(d.groupId, d.artifactId, version=d.version))
- results = XMvnResolve.process_raw_request(reqs)
+ results = XMvnResolve.process_raw_request(reqs, rpmconf.scl)
pom_requires = set()
for i, r in enumerate(results):
dep = MetadataDependency(deps[i].groupId, deps[i].artifactId,
diff --git a/python/javapackages/xmvn/xmvn_resolve.py
b/python/javapackages/xmvn/xmvn_resolve.py
index 300d29b..706200b 100644
--- a/python/javapackages/xmvn/xmvn_resolve.py
+++ b/python/javapackages/xmvn/xmvn_resolve.py
@@ -30,12 +30,12 @@
#
# Authors: Michal Srb <msrb(a)redhat.com>
-from javapackages.common.config import get_configs
-
-import subprocess
import lxml.etree
import os
+from javapackages.common.config import get_configs
+from javapackages.common.util import execute_command
+
class XMvnResolve(object):
# TODO:
@@ -46,13 +46,15 @@ class XMvnResolve(object):
return os.path.exists(XMvnResolve._load_path_from_config())
@staticmethod
- def process_raw_request(raw_request_list):
+ def process_raw_request(raw_request_list, scl=None):
binpath = XMvnResolve._load_path_from_config()
request = XMvnResolve.__join_raw_requests(raw_request_list)
- procargs = [binpath, '--raw-request']
- proc = subprocess.Popen(procargs, shell=False, stdout=subprocess.PIPE,
stdin=subprocess.PIPE, universal_newlines=True)
- stdout = proc.communicate(input=request)[0]
- proc.wait()
+ rc, stdout, stderr = execute_command(binpath, args=["--raw-request"],
+ input=request, enable_scl=scl)
+
+ if rc != 0:
+ raise Exception(stderr)
+
result = XMvnResolve.__process_results(stdout)
return result
Show replies by date