diff options
| author |   Vlastimil Babka <caster@gentoo.org> | 2009-05-19 21:23:32 +0000 |
|---|---|---|
| committer | Vlastimil Babka <caster@gentoo.org> | 2009-05-19 21:23:32 +0000 |
| commit | d229ff7e4c4115dcdf51412b67965ea5adea03ad (patch) | |
| tree | a907f20049d8e9d917db2a666614ea9ff8f7acfb /eclass/java-utils-2.eclass | |
| parent | Keyword ~x86 per bug #270203 (diff) | |
| download | gentoo-2-d229ff7e4c4115dcdf51412b67965ea5adea03ad.tar.gz gentoo-2-d229ff7e4c4115dcdf51412b67965ea5adea03ad.tar.bz2 gentoo-2-d229ff7e4c4115dcdf51412b67965ea5adea03ad.zip | |
Use dosym in java_pkg-doso and fix few debug prints. Patch by Davide Pesavento <davidepesa@gmail.com> in bug #251500.
Diffstat (limited to 'eclass/java-utils-2.eclass')
| -rw-r--r-- | eclass/java-utils-2.eclass | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/eclass/java-utils-2.eclass b/eclass/java-utils-2.eclass index f2f5e09e9991..ce8d13072bae 100644 --- a/eclass/java-utils-2.eclass +++ b/eclass/java-utils-2.eclass @@ -6,7 +6,7 @@ # # Licensed under the GNU General Public License, v2 # -# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.126 2009/03/31 19:19:20 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.127 2009/05/19 21:23:32 caster Exp $ # ----------------------------------------------------------------------------- # @eclass-begin @@ -432,10 +432,9 @@ java-pkg_addcp() { java-pkg_doso() { debug-print-function ${FUNCNAME} $* - [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}" java-pkg_check-phase install - [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME}" + [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument" java-pkg_init_paths_ @@ -453,10 +452,8 @@ java-pkg_doso() { debug-print "Installing ${lib} to ${JAVA_PKG_LIBDEST}" # otherwise make a symlink to the symlink's origin else - # TODO use dosym - ln -s "$(readlink "${lib}")" \ - "${D}${JAVA_PKG_LIBDEST}/$(basename "${lib}")" - debug-print "${lib} is a symlink, linking accordanly" + dosym "$(readlink "${lib}")" "${JAVA_PKG_LIBDEST}/${lib##*/}" + debug-print "${lib} is a symlink, linking accordantly" fi # otherwise die else @@ -482,7 +479,7 @@ java-pkg_regso() { java-pkg_check-phase install - [[ ${#} -lt 1 ]] && "at least one argument needed" + [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument" java-pkg_init_paths_ |