mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-05 20:26:44 +02:00
eclass/java-utils-2: Sync with Gentoo
It's from Gentoo commit 74969e04323ddb6034a3581b93ec292a9304e767. Signed-off-by: Flatcar Buildbot <buildbot@flatcar-linux.org>
This commit is contained in:
parent
704529b37e
commit
ee74fe185a
@ -1305,7 +1305,7 @@ java-pkg_getjar() {
|
||||
classpath=$(java-config --classpath=${pkg})
|
||||
[[ $? != 0 ]] && die ${error_msg}
|
||||
|
||||
java-pkg_ensure-dep "${build_only}" "${pkg}"
|
||||
[[ -z ${PORTAGE_QUIET} ]] && java-pkg_ensure-dep "${build_only}" "${pkg}"
|
||||
|
||||
# Record the package(Virtual) as a dependency and then set build_only
|
||||
# So that individual jars are not recorded.
|
||||
@ -1325,7 +1325,7 @@ java-pkg_getjar() {
|
||||
|
||||
if [[ "$(basename ${jar})" == "${target_jar}" ]] ; then
|
||||
# Only record jars that aren't build-only
|
||||
if [[ -z "${record_jar}" ]]; then
|
||||
if [[ -z "${record_jar}" && -z ${PORTAGE_QUIET} ]]; then
|
||||
if [[ -z "${build_only}" ]]; then
|
||||
java-pkg_record-jar_ "${pkg}" "${jar}"
|
||||
else
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user