summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Räty <betelgeuse@gentoo.org>2007-12-18 00:23:06 +0000
committerPetteri Räty <betelgeuse@gentoo.org>2007-12-18 00:23:06 +0000
commit498f0e5b6eae4c1ad4edbae18ad7170eb05f4b0b (patch)
treee26d086a2fefd48cd468481a8c753efe7a5e21c0 /eclass/java-ant-2.eclass
parent1.56 tested and working on MIPS. Marked stable. Quoting fixed in all versions. (diff)
downloadgentoo-2-498f0e5b6eae4c1ad4edbae18ad7170eb05f4b0b.tar.gz
gentoo-2-498f0e5b6eae4c1ad4edbae18ad7170eb05f4b0b.tar.bz2
gentoo-2-498f0e5b6eae4c1ad4edbae18ad7170eb05f4b0b.zip
java-ant_bsfix_files was returning 1 when JAVA_PKG_DEBUG is on.
Diffstat (limited to 'eclass/java-ant-2.eclass')
-rw-r--r--eclass/java-ant-2.eclass4
1 files changed, 3 insertions, 1 deletions
diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass
index 84a06bc2beb1..a6e97f777117 100644
--- a/eclass/java-ant-2.eclass
+++ b/eclass/java-ant-2.eclass
@@ -14,7 +14,7 @@
#
# Licensed under the GNU General Public License, v2
#
-# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.23 2007/08/05 08:17:05 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.24 2007/12/18 00:23:06 betelgeuse Exp $
inherit java-utils-2
@@ -339,6 +339,7 @@ java-ant_bsfix_files() {
done
fi
fi
+ return 0 # so that the 1 for diff doesn't get reported
}
@@ -372,6 +373,7 @@ java-ant_rewrite-classpath() {
local file="${1}"
[[ -z "${1}" ]] && file=build.xml
+ [[ ${#} -gt 1 ]] && die "${FUNCNAME} currently can only rewrite one file."
echo "Adding gentoo.classpath to ${file}"
debug-print "java-ant_rewrite-classpath: ${file}"