Due to the injection of $CTARGET and $CHOST in file path
we could end up with an already checked config file candidate
if $CTARGET or $CHOST isn't used.
This commit will make sure that we don't check the same file twice.
Signed-off-by: Thomas Deutschmann <whi...@gentoo.org>
---
eclass/savedconfig.eclass | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index 1ea464271aff..b2be715630af 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -113,20 +113,24 @@ restore_config() {
use savedconfig || return
- local found check configfile
+ local found check checked configfile
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}
+ configfile=${base}/${CTARGET:+"${CTARGET}/"}${check}
+ [[ -r ${configfile} ]] ||
configfile=${base}/${CHOST:+"${CHOST}/"}${check}
[[ -r ${configfile} ]] || configfile=${base}/${check}
- einfo "Checking existence of ${configfile} ..."
+ [[ "${checked}" == *"${configfile} "* ]] && continue
+ einfo "Checking existence of \"${configfile}\" ..."
if [[ -r "${configfile}" ]] ; then
einfo "Found \"${configfile}\""
found=${configfile}
_SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/}
break
fi
+
+ checked+="${configfile} "
done
+
if [[ -f ${found} ]]; then
elog "Building using saved configfile \"${found}\""
if [ $# -gt 0 ]; then
--
2.22.0
