Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 386416 Details for
Bug 524964
sys-apps/portage-2.2.13 + unable to run portageq in ebuilds
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
bin/ebuild-helpers/portageq: fix bug #524964
bin-ebuild-helpers-portageq-fix-bug-524964.patch (text/plain), 1.93 KB, created by
Zac Medico
on 2014-10-11 08:23:14 UTC
(
hide
)
Description:
bin/ebuild-helpers/portageq: fix bug #524964
Filename:
MIME Type:
Creator:
Zac Medico
Created:
2014-10-11 08:23:14 UTC
Size:
1.93 KB
patch
obsolete
>From d16a4eb704fd91a60341daef7b31dcede7f17bf5 Mon Sep 17 00:00:00 2001 >From: Zac Medico <zmedico@gentoo.org> >Date: Fri, 10 Oct 2014 21:32:54 -0700 >Subject: [PATCH] bin/ebuild-helpers/portageq: fix bug #524964 > >Since commit 0cc4c1ac21a2ea94cfb1f6ff4b461a9e349d47df, >$PORTAGE_BIN_PATH/portageq no longer exists, which breaks >bin/ebuild-helpers/portageq. Note that has_version and best_version >rely on bin/ebuild-helpers/portageq if IPC is disabled, so breakage >extends beyond ebuilds that call portageq "illegally". Since >$PORTAGE_BIN_PATH no longer works, use PATH to locate the real >portageq python script. > >Fixes: 0cc4c1ac21a2 ("Install Portage using setup.py") >X-Gento-Bug: 524964 >X-Gentoo-URL: https://bugs.gentoo.org/show_bug.cgi?id=524964 >--- > bin/ebuild-helpers/portageq | 20 ++++++++++++++++++-- > 1 file changed, 18 insertions(+), 2 deletions(-) > >diff --git a/bin/ebuild-helpers/portageq b/bin/ebuild-helpers/portageq >index b67b03f..4151bac 100755 >--- a/bin/ebuild-helpers/portageq >+++ b/bin/ebuild-helpers/portageq >@@ -2,9 +2,25 @@ > # Copyright 2009-2013 Gentoo Foundation > # Distributed under the terms of the GNU General Public License v2 > >+scriptpath=${BASH_SOURCE[0]} >+scriptname=${scriptpath##*/} >+ > PORTAGE_BIN_PATH=${PORTAGE_BIN_PATH:-/usr/lib/portage/bin} > PORTAGE_PYM_PATH=${PORTAGE_PYM_PATH:-/usr/lib/portage/pym} > # Use safe cwd, avoiding unsafe import for bug #469338. > cd "${PORTAGE_PYM_PATH}" >-PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \ >- exec "${PORTAGE_PYTHON:-/usr/bin/python}" "$PORTAGE_BIN_PATH/portageq" "$@" >+ >+IFS=':' >+set -f # in case ${PATH} contains any shell glob characters >+ >+for path in ${PATH}; do >+ [[ -x ${path}/${scriptname} ]] || continue >+ [[ ${path}/${scriptname} -ef ${scriptpath} ]] && continue >+ PYTHONPATH=${PORTAGE_PYTHONPATH:-${PORTAGE_PYM_PATH}} \ >+ exec "${PORTAGE_PYTHON:-/usr/bin/python}" \ >+ "${path}/${scriptname}" "$@" >+done >+ >+unset IFS >+echo "${scriptname}: command not found" 1>&2 >+exit 127 >-- >1.8.5.5 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 524964
:
386408
|
386416
|
387392