From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1M6Wmc-0007JM-9x for garchives@archives.gentoo.org; Tue, 19 May 2009 21:23:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CF7F2E0498; Tue, 19 May 2009 21:23:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id B0C1DE0498 for ; Tue, 19 May 2009 21:23:33 +0000 (UTC) Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTP id 592316450F for ; Tue, 19 May 2009 21:23:33 +0000 (UTC) Received: from caster by stork.gentoo.org with local (Exim 4.69) (envelope-from ) id 1M6Wmb-00067B-0X for gentoo-commits@lists.gentoo.org; Tue, 19 May 2009 21:23:33 +0000 From: "Vlastimil Babka (caster)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, caster@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in eclass: java-utils-2.eclass X-VCS-Repository: gentoo-x86 X-VCS-Files: java-utils-2.eclass X-VCS-Directories: eclass X-VCS-Committer: caster X-VCS-Committer-Name: Vlastimil Babka Content-Type: text/plain; charset=utf8 Message-Id: Sender: Vlastimil Babka Date: Tue, 19 May 2009 21:23:33 +0000 Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: a6bd9866-002a-4a49-a93b-bf961f212980 X-Archives-Hash: 338f69a1514f9098ab94205737db4baa caster 09/05/19 21:23:33 Modified: java-utils-2.eclass Log: Use dosym in java_pkg-doso and fix few debug prints. Patch by Davide Pe= savento in bug #251500. Revision Changes Path 1.127 eclass/java-utils-2.eclass file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-= 2.eclass?rev=3D1.127&view=3Dmarkup plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-= 2.eclass?rev=3D1.127&content-type=3Dtext/plain diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/java-utils-= 2.eclass?r1=3D1.126&r2=3D1.127 Index: java-utils-2.eclass =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v retrieving revision 1.126 retrieving revision 1.127 diff -u -r1.126 -r1.127 --- java-utils-2.eclass 31 Mar 2009 19:19:20 -0000 1.126 +++ java-utils-2.eclass 19 May 2009 21:23:32 -0000 1.127 @@ -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 20= 09/03/31 19:19:20 betelgeuse Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-utils-2.eclass,v 1.127 20= 09/05/19 21:23:32 caster Exp $ =20 # ----------------------------------------------------------------------= ------- # @eclass-begin @@ -432,10 +432,9 @@ java-pkg_doso() { debug-print-function ${FUNCNAME} $* =20 - [[ ${#} -lt 1 ]] && "At least one argument required for ${FUNCNAME}" java-pkg_check-phase install =20 - [[ ${#} -lt 1 ]] && die "At least one argument required for ${FUNCNAME= }" + [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument" =20 java-pkg_init_paths_ =20 @@ -453,10 +452,8 @@ 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 @@ =20 java-pkg_check-phase install =20 - [[ ${#} -lt 1 ]] && "at least one argument needed" + [[ ${#} -lt 1 ]] && die "${FUNCNAME} requires at least one argument" =20 java-pkg_init_paths_ =20