diff options
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index 37fa70942c7f..428aed81dee2 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -278,7 +278,7 @@ java-pkg_newjar() { local new_jar_dest="${T}/${new_jar}" [[ -z ${original_jar} ]] && die "Must specify a jar to install" - [[ ! -f ${original_jar} ]] && die "${new_jar} does not exist!" + [[ ! -f ${original_jar} ]] && die "${original_jar} does not exist!" rm -f "${new_jar_dest}" || die "Failed to remove ${new_jar_dest}" cp "${original_jar}" "${new_jar_dest}" \ @@ -1233,7 +1233,9 @@ eant() { ejavac() { debug-print-function ${FUNCNAME} $* - local compiler_executable=$(java-pkg_get-javac) + # FIXME using get-javac ends up printing stuff with einfo +# local compiler_executable=$(java-pkg_get-javac) + local compiler_executable="javac" [[ -n ${JAVA_PKG_DEBUG} ]] && echo ${compiler_executable} $(java-pkg_javac-args) "${@}" ${compiler_executable} $(java-pkg_javac-args) "${@}" || die "ejavac failed" |