Go to:
Gentoo Home
Documentation
Forums
Lists
Bugs
Planet
Store
Wiki
Get Gentoo!
Gentoo's Bugzilla – Attachment 577334 Details for
Bug 686350
savedconfig.eclass: Configuration file schemes with ${CTARGET} / ${CHOST} should not be used when ${CTARGET} / ${CHOST} are empty
Home
|
New
–
[Ex]
|
Browse
|
Search
|
Privacy Policy
|
[?]
|
Reports
|
Requests
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch
savedconfig.eclass.patch (text/plain), 1.95 KB, created by
Arfrever Frehtes Taifersar Arahesis
on 2019-05-20 00:28:05 UTC
(
hide
)
Description:
Patch
Filename:
MIME Type:
Creator:
Arfrever Frehtes Taifersar Arahesis
Created:
2019-05-20 00:28:05 UTC
Size:
1.95 KB
patch
obsolete
>From 13671dd5ab70de236e2ac4ce151517a83ed62b26 Mon Sep 17 00:00:00 2001 >From: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >Date: Mon, 20 May 2019 02:26:13 +0200 >Subject: [PATCH] savedconfig.eclass: Use configuration file schemes with > ${CTARGET} / ${CHOST} only when ${CTARGET} / ${CHOST} are not empty. > >Fixes: https://bugs.gentoo.org/686350 >Signed-off-by: Arfrever Frehtes Taifersar Arahesis <Arfrever@Apache.Org> >--- > eclass/savedconfig.eclass | 24 ++++++++++++------------ > 1 file changed, 12 insertions(+), 12 deletions(-) > >diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass >index a518125b29f..960b1538521 100644 >--- a/eclass/savedconfig.eclass >+++ b/eclass/savedconfig.eclass >@@ -111,19 +111,19 @@ restore_config() { > > use savedconfig || return > >- local found check configfile >+ local configfile found package_dependency_spec > local base=${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig >- for check in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do >- configfile=${base}/${CTARGET}/${check} >- [[ -r ${configfile} ]] || configfile=${base}/${CHOST}/${check} >- [[ -r ${configfile} ]] || configfile=${base}/${check} >- einfo "Checking existence of ${configfile} ..." >- if [[ -r "${configfile}" ]]; then >- einfo "Found ${configfile}" >- found=${configfile} >- _SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/} >- break >- fi >+ for package_dependency_spec in {${CATEGORY}/${PF},${CATEGORY}/${P},${CATEGORY}/${PN}}; do >+ for configfile in ${CTARGET:+${CTARGET}/${package_dependency_spec}} ${CHOST:+${CHOST}/${package_dependency_spec}} ${package_dependency_spec}; do >+ configfile=${base}/${configfile} >+ einfo "Checking existence of ${configfile} ..." >+ if [[ -r "${configfile}" ]]; then >+ einfo "Found ${configfile}" >+ found=${configfile} >+ _SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/} >+ break 2 >+ fi >+ done > done > if [[ -f ${found} ]]; then > elog "Building using saved configfile ${found}" >-- >2.21.0 >
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 686350
:
577334
|
586286