[java-sig-commits] [javapackages] [maven.req] Properly SCL-ize all calls to xmvn-resolve

[Michal Srb]

commit 362b675e4aa0d47990aafe004ab575de72fd0039
Author: Michal Srb 
Date:   Thu Dec 4 17:44:40 2014 +0100

[maven.req] Properly SCL-ize all calls to xmvn-resolve

depgenerators/maven.req |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)
---
diff --git a/depgenerators/maven.req b/depgenerators/maven.req
index 4ec0a4d..a2799f7 100755
--- a/depgenerators/maven.req
+++ b/depgenerators/maven.req
@@ -72,7 +72,7 @@ class TagBuilder(object):

# generate also R on plugins and extensions from POM file, but only
             # if this is POM-only package and xmvn-resolve is installed
-            if XMvnResolve.is_available():
+            if XMvnResolve.is_available(scl=rpmconf.scl):
                 if metadata.contains_only_poms():
                     self.print_pom_requires(metadata)

@@ -108,7 +108,7 @@ class TagBuilder(object):

unknown_deps = []
         # check if dependencies on POM files are satisfiable
-        if XMvnResolve.is_available():
+        if XMvnResolve.is_available(scl=rpmconf.scl):
             unknown_deps = self._check_pom_deps()

for dependency in metadata.get_required_artifacts():
@@ -256,7 +256,7 @@ class TagBuilder(object):
                                                 version=dep.requestedVersion)
                     requests.append(request)
             if requests:
-                results = XMvnResolve.process_raw_request(requests, rpmconf.scl)
+                results = XMvnResolve.process_raw_request(requests, scl=rpmconf.scl)
                 for i, r in enumerate(results):
                     if not r:
                         unresolvable.append(deps[i])
@@ -285,7 +285,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, rpmconf.scl)
+        results = XMvnResolve.process_raw_request(reqs, scl=rpmconf.scl)
         pom_requires = set()
         for i, r in enumerate(results):
             dep = MetadataDependency(deps[i].groupId, deps[i].artifactId,
@@ -313,7 +313,7 @@ class TagBuilder(object):
                                 "because its parent POM {}:{} has unknown version".format(pgid, paid))

req = ResolutionRequest(pgid, paid, extension="pom")
-            r = XMvnResolve.process_raw_request([req])[0]
+            r = XMvnResolve.process_raw_request([req], scl=rpmconf.scl)[0]
             dep = MetadataDependency(pgid, paid, requestedVersion=pver, extension="pom")

dver = dep.is_provided_by(self.provided_artifacts)[1]