commit b03aecbdbaef347f23aad9d82839c3fecc371e38
Author: Michal Srb <msrb(a)redhat.com>
Date: Tue May 13 08:27:42 2014 +0200
[maven_depmap] Drop buildroot prefix from pom/jar paths
This should fix rhbz#1097052
java-utils/maven_depmap.py | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/java-utils/maven_depmap.py b/java-utils/maven_depmap.py
index 7231769..8b32c08 100644
--- a/java-utils/maven_depmap.py
+++ b/java-utils/maven_depmap.py
@@ -45,6 +45,7 @@ import os
import shutil
import sys
import gzip
+import re
from os.path import basename
import zipfile
@@ -264,15 +265,19 @@ if __name__ == "__main__":
if namespace:
artifact.namespace = namespace
+
+ buildroot = os.environ.get('RPM_BUILD_ROOT')
am = []
if jar_path:
- artifact.path = os.path.abspath(jar_path)
+ metadata_jar_path = os.path.abspath(jar_path)
+ artifact.path = metadata_jar_path.replace(buildroot, "") if buildroot
else metadata_jar_path
am.append(artifact.to_metadata())
# output file path for file list (if it's not versioned)
if not add_versions:
print jar_path
if have_pom:
- artifact.path = os.path.abspath(pom_path)
+ metadata_pom_path = os.path.abspath(pom_path)
+ artifact.path = metadata_pom_path.replace(buildroot, "") if buildroot
else metadata_pom_path
artifact.extension = "pom"
am.append(artifact.to_metadata())
# output file path for file list (if it's not versioned)
Show replies by date