From 13fa4dfbabf2d68d7e0f15631b334d8a1f461f5b Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Sat, 25 Oct 2014 18:25:20 -0700 Subject: [PATCH] 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-Gento-Bug: 524964 X-Gentoo-URL: https://bugs.gentoo.org/show_bug.cgi?id=524964 --- 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 -- 2.0.4