From: Vlastimil Babka Date: Thu, 26 Apr 2007 23:32:12 +0000 (+0000) Subject: Remove IFS mangling instance with potential breakage. X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2b1f5efc8f60ed5e24aa84c8bb3eed4bc00c24c5;p=gentoo.git Remove IFS mangling instance with potential breakage. --- diff --git a/eclass/java-ant-2.eclass b/eclass/java-ant-2.eclass index 1f8c2fc63e61..4cf198619dff 100644 --- a/eclass/java-ant-2.eclass +++ b/eclass/java-ant-2.eclass @@ -10,7 +10,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.20 2007/03/15 13:31:50 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-ant-2.eclass,v 1.21 2007/04/26 23:32:12 caster Exp $ inherit java-utils-2 @@ -271,6 +271,11 @@ java-ant_bsfix_files() { eval xml-rewrite-2.py ${files} \ -c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \ -a target -v ${want_target} ${output} || _bsfix_die "xml-rewrite2 failed: ${file}" + + eval echo "Rewriting nowarn attributes" ${output} + eval xml-rewrite-2.py ${files} \ + -c -e ${JAVA_PKG_BSFIX_TARGET_TAGS// / -e } \ + -a nowarn -v yes ${output} || _bsfix_die "xml-rewrite2 failed: ${file}" fi if [[ -n "${JAVA_PKG_DEBUG}" ]]; then diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index ee9f28ba7d88..c98d7bfa7f44 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.79 2007/04/26 14:50:00 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.80 2007/04/26 23:32:12 caster Exp $ # ----------------------------------------------------------------------------- @@ -997,12 +997,9 @@ java-pkg_getjars() { # Only record jars that aren't build-only if [[ -z "${build_only}" ]]; then - oldifs="${IFS}" - IFS="," - for pkg in ${pkgs}; do + for pkg in ${pkgs//:/ }; do java-pkg_record-jar_ "${pkg}" done - IFS="${oldifs}" fi echo "${classpath}"