|
 |
9b68ce |
From 9b686830f939a27f674f5cd0abead68ae696efd0 Mon Sep 17 00:00:00 2001
|
|
|
9b68ce |
From: Michal Srb <msrb@redhat.com>
|
|
|
9b68ce |
Date: Wed, 7 Jan 2015 00:47:08 +0100
|
|
|
9b68ce |
Subject: [PATCH 2/3] [mvn_artifact] Fix "TypeError: process_raw_request() got
|
|
|
9b68ce |
an unexpected keyword argument 'scl'"
|
|
|
9b68ce |
|
|
|
9b68ce |
---
|
|
|
9b68ce |
java-utils/mvn_artifact.py | 12 +++++-------
|
|
|
9b68ce |
macros.d/macros.xmvn | 2 +-
|
|
|
9b68ce |
2 files changed, 6 insertions(+), 8 deletions(-)
|
|
|
9b68ce |
|
|
|
9b68ce |
diff --git a/java-utils/mvn_artifact.py b/java-utils/mvn_artifact.py
|
|
|
9b68ce |
index 0bd97e0..52d6dac 100644
|
|
|
9b68ce |
--- a/java-utils/mvn_artifact.py
|
|
|
9b68ce |
+++ b/java-utils/mvn_artifact.py
|
|
|
9b68ce |
@@ -88,7 +88,7 @@ class UnknownVersion(Exception):
|
|
|
9b68ce |
pass
|
|
|
9b68ce |
|
|
|
9b68ce |
|
|
|
9b68ce |
-def get_parent_pom(pom, scl=None):
|
|
|
9b68ce |
+def get_parent_pom(pom):
|
|
|
9b68ce |
try:
|
|
|
9b68ce |
metadata = Metadata(config)
|
|
|
9b68ce |
known_artifacts = metadata.get_provided_artifacts()
|
|
|
9b68ce |
@@ -103,7 +103,7 @@ def get_parent_pom(pom, scl=None):
|
|
|
9b68ce |
|
|
|
9b68ce |
req = ResolutionRequest(pom.groupId, pom.artifactId,
|
|
|
9b68ce |
extension="pom", version=pom.version)
|
|
|
9b68ce |
- result = XMvnResolve.process_raw_request([req], scl=scl)[0]
|
|
|
9b68ce |
+ result = XMvnResolve.process_raw_request([req])[0]
|
|
|
9b68ce |
if not result:
|
|
|
9b68ce |
raise Exception("Unable to resolve parent POM")
|
|
|
9b68ce |
|
|
|
9b68ce |
@@ -169,7 +169,7 @@ def expand_props(deps, props):
|
|
|
9b68ce |
d.interpolate(props)
|
|
|
9b68ce |
|
|
|
9b68ce |
|
|
|
9b68ce |
-def gather_dependencies(pom_path, scl=None):
|
|
|
9b68ce |
+def gather_dependencies(pom_path):
|
|
|
9b68ce |
if not pom_path:
|
|
|
9b68ce |
return []
|
|
|
9b68ce |
pom = POM(pom_path)
|
|
|
9b68ce |
@@ -189,7 +189,7 @@ def gather_dependencies(pom_path, scl=None):
|
|
|
9b68ce |
except PomLoadingException:
|
|
|
9b68ce |
pass
|
|
|
9b68ce |
if not ppom:
|
|
|
9b68ce |
- ppom = get_parent_pom(parent, scl=scl)
|
|
|
9b68ce |
+ ppom = get_parent_pom(parent)
|
|
|
9b68ce |
|
|
|
9b68ce |
parent = ppom.parent
|
|
|
9b68ce |
pom_props = get_model_variables(ppom)
|
|
|
9b68ce |
@@ -246,8 +246,6 @@ if __name__ == "__main__":
|
|
|
9b68ce |
help="skip dependencies section in resulting metadata")
|
|
|
9b68ce |
parser.add_option("-D", action="append", type="str",
|
|
|
9b68ce |
help="add artifact property", metavar="property=value")
|
|
|
9b68ce |
- parser.add_option("-n", "--namespace", type="str",
|
|
|
9b68ce |
- help=SUPPRESS_HELP, default=None)
|
|
|
9b68ce |
|
|
|
9b68ce |
sys.argv = args_to_unicode(sys.argv)
|
|
|
9b68ce |
|
|
|
9b68ce |
@@ -300,7 +298,7 @@ if __name__ == "__main__":
|
|
|
9b68ce |
if (not options.skip_dependencies and pom_path
|
|
|
9b68ce |
and not is_it_ivy_file(pom_path)):
|
|
|
9b68ce |
deps = []
|
|
|
9b68ce |
- mvn_deps = gather_dependencies(pom_path, scl=options.namespace)
|
|
|
9b68ce |
+ mvn_deps = gather_dependencies(pom_path)
|
|
|
9b68ce |
for d in mvn_deps:
|
|
|
9b68ce |
deps.append(MetadataDependency.from_mvn_dependency(d))
|
|
|
9b68ce |
if deps:
|
|
|
9b68ce |
diff --git a/macros.d/macros.xmvn b/macros.d/macros.xmvn
|
|
|
9b68ce |
index 1a587fb..e7a6dda 100644
|
|
|
9b68ce |
--- a/macros.d/macros.xmvn
|
|
|
9b68ce |
+++ b/macros.d/macros.xmvn
|
|
|
9b68ce |
@@ -118,7 +118,7 @@
|
|
|
9b68ce |
#
|
|
|
9b68ce |
# Usage: %mvn_artifact <pom> [<artifact-file>]
|
|
|
9b68ce |
#
|
|
|
9b68ce |
-%mvn_artifact %{pyinterpreter} %{javadir}-utils/mvn_artifact.py %{?scl:-n %{?scl}}
|
|
|
9b68ce |
+%mvn_artifact %{pyinterpreter} %{javadir}-utils/mvn_artifact.py
|
|
|
9b68ce |
|
|
|
9b68ce |
|
|
|
9b68ce |
# %mvn_build - build Maven project
|
|
|
9b68ce |
--
|
|
|
9b68ce |
2.1.0
|
|
|
9b68ce |
|