[java-sig-commits] [javapackages] Use merge_artifacts in maven_depmap for aliases

[Stanislav Ochotnicky]

commit 9d83873413745ba4db618f2b4c674009d321bf0c
Author: Stanislav Ochotnicky <sochotnicky at redhat.com>
Date:   Tue Sep 10 13:14:10 2013 +0200

    Use merge_artifacts in maven_depmap for aliases
    
    This way aliases get missing information from main artifact. We can skip some
    parts completely if they are the same as primary artifact

 java-utils/maven_depmap.py |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)
---
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index b656812..3fb2561 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -184,7 +184,9 @@ def create_mappings(fragment, additions = None):
     if additions:
         adds = additions.split(',')
         for add in adds:
-            maps.append(Fragment(Artifact.from_mvn_str(add), fragment.local_artifact))
+            mpart = Artifact.from_mvn_str(add)
+            full = Artifact.merge_artifacts(mpart, fragment.upstream_artifact)
+            maps.append(Fragment(full, fragment.local_artifact))
     return maps
 
 def prettify_element(elem):