diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2007-04-26 23:32:12 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2007-04-26 23:32:12 +0000 |
| commit | 5d5c351a5ab0e5ca7cc447b55ea726587bad8c8e (patch) | |
| tree | b307b7d58e9c2b9bd297d44742177c6befff0361 /eclass | |
| parent | Apply fix for segfault with libX11-1.1.1-r1 (diff) | |
| download | gentoo-2-5d5c351a5ab0e5ca7cc447b55ea726587bad8c8e.tar.gz gentoo-2-5d5c351a5ab0e5ca7cc447b55ea726587bad8c8e.tar.bz2 gentoo-2-5d5c351a5ab0e5ca7cc447b55ea726587bad8c8e.zip | |
Remove IFS mangling instance with potential breakage.
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/java-ant-2.eclass | 7 | ||||
| -rw-r--r-- | eclass/java-utils-2.eclass | 7 |
2 files changed, 8 insertions, 6 deletions
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}" |