[maven] Run redundant dependency checks only in mock
Mikolaj Izdebski
mizdebsk at fedoraproject.org
Mon Jul 23 16:38:59 UTC 2012
commit 7d259eee4bee16a32dc6fbb67700d491fa844a1c
Author: Mikolaj Izdebski <mizdebsk at redhat.com>
Date: Mon Jul 23 18:37:28 2012 +0200
Run redundant dependency checks only in mock
maven-script-rpmbuild | 13 ++++++++++---
maven.spec | 5 ++++-
2 files changed, 14 insertions(+), 4 deletions(-)
---
diff --git a/maven-script-rpmbuild b/maven-script-rpmbuild
index aabab06..f50b2f1 100644
--- a/maven-script-rpmbuild
+++ b/maven-script-rpmbuild
@@ -33,8 +33,15 @@ function help()
# add maven.repo.local if it's not defined already
local_add="-Dmaven.repo.local=$(pwd)/.m2/"
-log_file="$(umask 2 && mktemp -t mvn-rpmbuild.$$.XXXXXXXXXX)"
-logfile_add="-Dmaven.resolver.logfile=$log_file"
+# Check whether we are ran in mock
+# FIXME: is there a better way to do this?
+mock=test
+test "$HOME" = /builddir && mock=:
+
+if $mock; then
+ log_file="$(umask 2 && mktemp -t mvn-rpmbuild.$$.XXXXXXXXXX)"
+ logfile_add="-Dmaven.resolver.logfile=$log_file"
+fi
function process_args()
{
@@ -69,7 +76,7 @@ export JAVA_HOME
export MAVEN_OPTS="$MAVEN_OPTS -Dmaven.local.mode ${local_add} ${logfile_add}"
$M2_HOME/bin/mvn -o "$@" || exit $?
-
+$mock || exit
sanitize() {
for obj in $1; do
diff --git a/maven.spec b/maven.spec
index 518ef89..c3aa72c 100644
--- a/maven.spec
+++ b/maven.spec
@@ -2,7 +2,7 @@
Name: maven
Version: 3.0.4
-Release: 8%{?dist}
+Release: 9%{?dist}
Summary: Java project management and project comprehension tool
Group: Development/Tools
@@ -367,6 +367,9 @@ ln -sf `rpm --eval '%%{_jnidir}'` %{_datadir}/%{name}/repository-jni/JPP
%changelog
+* Mon Jul 23 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.0.4-9
+- Run redundant dependency checks only in mock
+
* Tue Jul 17 2012 Mikolaj Izdebski <mizdebsk at redhat.com> - 3.0.4-8
- Add manual page
More information about the scm-commits
mailing list