28 lines
939 B
Diff
28 lines
939 B
Diff
From bebc7ceb9d6b75020b664294a7404c414050a163 Mon Sep 17 00:00:00 2001
|
|
From: Stanislav Ochotnicky <sochotnicky@redhat.com>
|
|
Date: Wed, 25 Sep 2013 17:21:48 +0200
|
|
Subject: [PATCH 2/3] [mvn_build] Do not install artifacts with classifiers in
|
|
singleton mode
|
|
|
|
---
|
|
java-utils/mvn_build.py | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/java-utils/mvn_build.py b/java-utils/mvn_build.py
|
|
index 9369979..957cbe0 100644
|
|
--- a/java-utils/mvn_build.py
|
|
+++ b/java-utils/mvn_build.py
|
|
@@ -140,6 +140,9 @@ if __name__ == "__main__":
|
|
mvn_args.extend(options.goal_after)
|
|
|
|
if options.singleton:
|
|
+ # make sure we don't install artifacts with non-empty classifiers
|
|
+ xc.add_package_mapping(Artifact.from_mvn_str(":::*?:"), "__noinstall",
|
|
+ optional=True)
|
|
xc.add_package_mapping(Artifact.from_mvn_str(":{*}"), "@1")
|
|
|
|
p = subprocess.Popen(" ".join(mvn_args), shell=True, env=env)
|
|
--
|
|
1.8.3.1
|
|
|