commit:     75b71f8afb5e29d4a317f4e0c680c58676e167fe
Author:     William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
AuthorDate: Mon Feb 22 00:07:00 2016 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Feb 22 10:29:47 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b71f8a

eclass/java-utils-2.eclass: Added -r to xargs in java-pkg_addres

The -r option is necessary in case find does not output anything. Which
makes the jar uf command fail. This has no effect otherwise and should
be safe to add right away. It prevents potential issues/bug.

 eclass/java-utils-2.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
index 5be7e17..cb1c1d8 100644
--- a/eclass/java-utils-2.eclass
+++ b/eclass/java-utils-2.eclass
@@ -262,7 +262,7 @@ java-pkg_addres() {
        shift 2
 
        pushd "${dir}" > /dev/null || die "pushd ${dir} failed"
-       find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name 
"MANIFEST.MF" ! -regex ".*\.\(class\|jar\|java\)" "${@}" -print0 | xargs -0 jar 
uf "${jar}" || die "jar failed"
+       find -L -type f ! -path "./target/*" ! -path "./sources.lst" ! -name 
"MANIFEST.MF" ! -regex ".*\.\(class\|jar\|java\)" "${@}" -print0 | xargs -r0 
jar uf "${jar}" || die "jar failed"
        popd > /dev/null || die "popd failed"
 }
 

Reply via email to