commit 04ed1b7226ee9ff12ea9bcb2e443cf7812e0c1c1
Author: Stanislav Ochotnicky <sochotnicky(a)redhat.com>
Date: Thu Nov 8 11:13:02 2012 +0100
Fix versioned pom installation by quoting _jpath
_jpath used to be initialized to non-existent string before, but that's no
longer true so we need to make sure it's properly quoted and we won't
incorrectly try to move jar files
macros.fjava | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/macros.fjava b/macros.fjava
index cdd510d..35e4015 100644
--- a/macros.fjava
+++ b/macros.fjava
@@ -86,7 +86,7 @@ python -m /usr/share/java-utils/maven_depmap %{-a} %{-v*:-r %{-v*}} \\\
if [[ "%{-v}" != "" ]];then \
mv %{buildroot}%{_mavenpomdir}/$_pompart \\\
%{buildroot}%{_mavenpomdir}/${_pompart/.pom/-%{version}.pom} \
-if [ -f ${_jpath} ]; then \
+if [ -f "${_jpath}" ]; then \
mv ${_jpath} ${_jpath/.jar/-%{version}.jar} \
fi \
for ver in $(echo %{-v*} | tr ',' '\\n');do \
@@ -94,7 +94,7 @@ for ver in $(echo %{-v*} | tr ',' '\\n');do \
%{buildroot}/%{_mavenpomdir}/${_pompart/.pom/-$ver.pom} \
echo %{_mavenpomdir}/${_pompart/.pom/-$ver.pom} >>${_filelist} \
# we can have pom-only artifacts \
- if [ -f ${_jpath/.jar/-%{version}.jar} ];then \
+ if [ -f "${_jpath/.jar/-%{version}.jar}" ];then \
ln -s `basename ${_jpath/.jar/-%{version}.jar}` \\\
${_jpath/.jar/-$ver.jar} \
echo ${_jpath/.jar/-$ver.jar} >>${_filelist} \
Show replies by date