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 4C84E138935 for ; Mon, 27 Oct 2014 09:47:06 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C47FEE08B2; Mon, 27 Oct 2014 09:47:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7AFA5E08B2 for ; Mon, 27 Oct 2014 09:47:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 743E13403BA for ; Mon, 27 Oct 2014 09:47:04 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0D1718D90 for ; Mon, 27 Oct 2014 09:47:03 +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: <1414403197.61c34d8f4681860e6b45b8f63627bd0173d020df.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/bashrc-functions.sh X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 61c34d8f4681860e6b45b8f63627bd0173d020df X-VCS-Branch: master Date: Mon, 27 Oct 2014 09:47:03 +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: d28137d7-e34f-45dd-b70f-31db4b072d87 X-Archives-Hash: 2283dec07068698858c58a8f3edd5959 commit: 61c34d8f4681860e6b45b8f63627bd0173d020df Author: Zac Medico gentoo org> AuthorDate: Sun Oct 26 01:25:20 2014 +0000 Commit: Zac Medico gentoo org> CommitDate: Mon Oct 27 09:46:37 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=61c34d8f bin/bashrc-functions.sh: remove portageq function Since commit 0cc4c1ac21a2ea94cfb1f6ff4b461a9e349d47df, $PORTAGE_BIN_PATH/portageq no longer exists, which breaks the portageq shell function inside bashrc-functions.sh. Note that $PORTAGE_BIN_PATH/ebuild-helpers/portageq is in $PATH, so we can simply remove the redundant function. Fixes: 0cc4c1a ("Install Portage using setup.py") X-Gentoo-Bug: 524964 X-Gentoo-URL: https://bugs.gentoo.org/show_bug.cgi?id=524964 Acked-by: Alexander Berntsen gentoo.org> --- bin/bashrc-functions.sh | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/bin/bashrc-functions.sh b/bin/bashrc-functions.sh index 503b172..cc02546 100644 --- a/bin/bashrc-functions.sh +++ b/bin/bashrc-functions.sh @@ -1,12 +1,7 @@ #!/bin/bash -# Copyright 1999-2013 Gentoo Foundation +# Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -portageq() { - PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}}\ - "${PORTAGE_PYTHON:-/usr/bin/python}" "${PORTAGE_BIN_PATH}/portageq" "$@" -} - register_die_hook() { local x for x in $* ; do