From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8A2FF138010 for ; Fri, 14 Sep 2012 07:27:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 677BC21C003; Fri, 14 Sep 2012 07:26:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 2CC9621C003 for ; Fri, 14 Sep 2012 07:26:35 +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 93B3B33D721 for ; Fri, 14 Sep 2012 07:26:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 4C47EE543F for ; Fri, 14 Sep 2012 07:26:33 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1347605744.2bafee5c926a644e58099bb5dbb3eec7cd80518c.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/isolated-functions.sh bin/save-ebuild-env.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 2bafee5c926a644e58099bb5dbb3eec7cd80518c X-VCS-Branch: master Date: Fri, 14 Sep 2012 07:26:33 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 136c2251-7e21-467f-9f08-8ac3312637e4 X-Archives-Hash: 98dcd9bbcb35eef5e0c939126e5685ec commit: 2bafee5c926a644e58099bb5dbb3eec7cd80518c Author: Brian Harring gmail com> AuthorDate: Fri Sep 14 04:56:10 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Fri Sep 14 06:55:44 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=2bafee5c Drop diefunc protection. The last usage of it was added 67e88b82726a93eda^, 01/20/08; 4.5 years later, the compatibility measure is no longer needed. --- bin/isolated-functions.sh | 6 ------ bin/save-ebuild-env.sh | 2 +- 2 files changed, 1 insertions(+), 7 deletions(-) diff --git a/bin/isolated-functions.sh b/bin/isolated-functions.sh index d33c0b6..37e5f2d 100644 --- a/bin/isolated-functions.sh +++ b/bin/isolated-functions.sh @@ -245,12 +245,6 @@ die() { exit 1 } -# We need to implement diefunc() since environment.bz2 files contain -# calls to it (due to alias expansion). -diefunc() { - die "${@}" -} - quiet_mode() { [[ ${PORTAGE_QUIET} -eq 1 ]] } diff --git a/bin/save-ebuild-env.sh b/bin/save-ebuild-env.sh index d8883cb..37438a5 100644 --- a/bin/save-ebuild-env.sh +++ b/bin/save-ebuild-env.sh @@ -47,7 +47,7 @@ save_ebuild_env() { unset x unset -f assert assert_sigpipe_ok \ - dump_trace die diefunc \ + dump_trace die \ quiet_mode vecho elog_base eqawarn elog \ esyslog einfo einfon ewarn eerror ebegin _eend eend KV_major \ KV_minor KV_micro KV_to_int get_KV unset_colors set_colors has \