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 1Rxrpi-0003Zc-4X for garchives@archives.gentoo.org; Thu, 16 Feb 2012 03:16:34 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E43D4E0CC7; Thu, 16 Feb 2012 03:16:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 1B7EDE0CC7 for ; Thu, 16 Feb 2012 03:16:25 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D727A1B4016 for ; Thu, 16 Feb 2012 03:16:23 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 94D4AE5400 for ; Thu, 16 Feb 2012 03:16:22 +0000 (UTC) From: "Kent Fredric" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Kent Fredric" Message-ID: <1329360237.f00eeb3b89dc0650dcd2e1d7dacde633f49234f6.kent@gentoo> Subject: [gentoo-commits] proj/perl-overlay:eclass-moretests commit in: eclass/ X-VCS-Repository: proj/perl-overlay X-VCS-Files: eclass/perl-module.eclass X-VCS-Directories: eclass/ X-VCS-Committer: kent X-VCS-Committer-Name: Kent Fredric X-VCS-Revision: f00eeb3b89dc0650dcd2e1d7dacde633f49234f6 X-VCS-Branch: eclass-moretests Date: Thu, 16 Feb 2012 03:16:22 +0000 (UTC) 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: 481e53db-2b08-4614-81e1-3cc7f91fafda X-Archives-Hash: a03ff0472ad127fb6b3fee4cb8425d38 commit: f00eeb3b89dc0650dcd2e1d7dacde633f49234f6 Author: Kent Fredric gmail com> AuthorDate: Thu Feb 16 02:43:57 2012 +0000 Commit: Kent Fredric gmail com> CommitDate: Thu Feb 16 02:43:57 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/perl-overlay.= git;a=3Dcommit;h=3Df00eeb3b replace die calls with perl_fatal_error to force the display of a custom = message on perl-related exceptions --- eclass/perl-module.eclass | 20 ++++++++++---------- 1 files changed, 10 insertions(+), 10 deletions(-) diff --git a/eclass/perl-module.eclass b/eclass/perl-module.eclass index 5115b80..22c8543 100644 --- a/eclass/perl-module.eclass +++ b/eclass/perl-module.eclass @@ -111,7 +111,7 @@ perl_diagnostics() { =20 perl_fatal_error() { debug-print-function $FUNCNAME "$@" - perl_diagnostics(); + perl_diagnostics; eerror "Please attach the contents of $(perl_diagfile) with your bug re= port"; die "$@" } @@ -158,7 +158,7 @@ perl-module_src_prep() { eqawarn " Add virtual/perl-Module-Build to DEPEND!" if [[ -n ${PERLQAFATAL} ]]; then eerror "Bailing out due to PERLQAFATAL=3D1"; - die; + perl_fatal_error; fi fi set -- \ @@ -169,7 +169,7 @@ perl-module_src_prep() { "${myconf_local[@]}" einfo "perl Build.PL" "$@" perl Build.PL "$@" <<< "${pm_echovar}" \ - || die "Unable to build!" + || perl_fatal_error "Unable to build!" elif [[ -f Makefile.PL ]] ; then einfo "Using ExtUtils::MakeMaker" set -- \ @@ -180,7 +180,7 @@ perl-module_src_prep() { "${myconf_local[@]}" einfo "perl Makefile.PL" "$@" perl Makefile.PL "$@" <<< "${pm_echovar}" \ - || die "Unable to build!" + || perl_fatal_error "Unable to build!" fi if [[ ! -f Build.PL && ! -f Makefile.PL ]] ; then einfo "No Make or Build file detected..." @@ -202,14 +202,14 @@ perl-module_src_compile() { =20 if [[ -f Build ]] ; then ./Build build \ - || die "Compilation failed" + || perl_fatal_error "Compilation failed" elif [[ -f Makefile ]] ; then set -- \ OTHERLDFLAGS=3D"${LDFLAGS}" \ "${mymake_local[@]}" einfo "emake" "$@" emake "$@" \ - || die "Compilation failed" + || perl_fatal_error "Compilation failed" # OPTIMIZE=3D"${CFLAGS}" \ fi } @@ -311,9 +311,9 @@ perl-module_src_test() { fi ${perlinfo_done} || perl_set_version if [[ -f Build ]] ; then - ./Build test verbose=3D${TEST_VERBOSE:-0} || die "test failed" + ./Build test verbose=3D${TEST_VERBOSE:-0} || perl_fatal_error "test f= ailed" elif [[ -f Makefile ]] ; then - emake test TEST_VERBOSE=3D${TEST_VERBOSE:-0} || die "test failed" + emake test TEST_VERBOSE=3D${TEST_VERBOSE:-0} || perl_fatal_error "tes= t failed" else ewarn "No ./Build or ./Makefile, can not run tests" fi @@ -343,10 +343,10 @@ perl-module_src_install() { =20 if [[ -f Build ]] ; then ./Build ${mytargets} \ - || die "./Build ${mytargets} failed" + || perl_fatal_error "./Build ${mytargets} failed" elif [[ -f Makefile ]] ; then emake "${myinst_local[@]}" ${mytargets} \ - || die "emake ${myinst_local[@]} ${mytargets} failed" + || perl_fatal_error "emake ${myinst_local[@]} ${mytargets} failed" fi =20 perl_delete_module_manpages