Remove IFS mangling instance with potential breakage.
authorVlastimil Babka <caster@gentoo.org>
Thu, 26 Apr 2007 23:32:12 +0000 (23:32 +0000)
committerVlastimil Babka <caster@gentoo.org>
Thu, 26 Apr 2007 23:32:12 +0000 (23:32 +0000)
eclass/java-ant-2.eclass
eclass/java-utils-2.eclass

index 1f8c2fc63e619d4def109d7520fcdf7db6852947..4cf198619dfff4fd04c8d8f8903cc58757886733 100644 (file)
@@ -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
index ee9f28ba7d88d9cce52100c448b317b385b30264..c98d7bfa7f4443279dc735a1fcaaf397848eaf48 100644 (file)
@@ -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}"