Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 22 Feb 2016 10:29:57
Message-Id: 1456136987.75b71f8afb5e29d4a317f4e0c680c58676e167fe.chewi@gentoo
1 commit: 75b71f8afb5e29d4a317f4e0c680c58676e167fe
2 Author: William L. Thomson Jr <wlt <AT> o-sinc <DOT> com>
3 AuthorDate: Mon Feb 22 00:07:00 2016 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Feb 22 10:29:47 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75b71f8a
7
8 eclass/java-utils-2.eclass: Added -r to xargs in java-pkg_addres
9
10 The -r option is necessary in case find does not output anything. Which
11 makes the jar uf command fail. This has no effect otherwise and should
12 be safe to add right away. It prevents potential issues/bug.
13
14 eclass/java-utils-2.eclass | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass
18 index 5be7e17..cb1c1d8 100644
19 --- a/eclass/java-utils-2.eclass
20 +++ b/eclass/java-utils-2.eclass
21 @@ -262,7 +262,7 @@ java-pkg_addres() {
22 shift 2
23
24 pushd "${dir}" > /dev/null || die "pushd ${dir} failed"
25 - 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"
26 + 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"
27 popd > /dev/null || die "popd failed"
28 }