summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Gilbert <floppym@gentoo.org>2021-10-31 15:16:06 -0400
committerMike Gilbert <floppym@gentoo.org>2021-11-05 15:17:13 -0400
commiteb71dfec11e09ae40ae90f27305948097b6591a2 (patch)
treeaba4bebee5c06e96365cea15bc5890b640fd1be8 /eclass/savedconfig.eclass
parentsys-devel/clang-runtime: Stabilize 13.0.0 amd64, #821862 (diff)
downloadgentoo-eb71dfec11e09ae40ae90f27305948097b6591a2.tar.gz
gentoo-eb71dfec11e09ae40ae90f27305948097b6591a2.tar.bz2
gentoo-eb71dfec11e09ae40ae90f27305948097b6591a2.zip
savedconfig.eclass: do not re-use config file scheme
This causes file collisions when save_config is used in a multi-slotted package and the config file is named ${PN}. Reverts: a0c35ad8ee8f8f89ba6044dd5b44e9479c6a1775 Bug: https://bugs.gentoo.org/686348 Closes: https://bugs.gentoo.org/818904 Signed-off-by: Mike Gilbert <floppym@gentoo.org>
Diffstat (limited to 'eclass/savedconfig.eclass')
-rw-r--r--eclass/savedconfig.eclass15
1 files changed, 1 insertions, 14 deletions
diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
index c4fd0c492f4..20669c08b33 100644
--- a/eclass/savedconfig.eclass
+++ b/eclass/savedconfig.eclass
@@ -39,13 +39,6 @@ case ${EAPI} in
*) die "EAPI=${EAPI:-0} is not supported" ;;
esac
-# @ECLASS-VARIABLE: _SAVEDCONFIG_CONFIGURATION_FILE
-# @DEFAULT_UNSET
-# @INTERNAL
-# @DESCRIPTION:
-# Path of configuration file, relative to /etc/portage/savedconfig,
-# restored by restore_config() and saved by save_config().
-
# @FUNCTION: save_config
# @USAGE: <config files to save>
# @DESCRIPTION:
@@ -59,12 +52,7 @@ save_config() {
fi
[[ $# -eq 0 ]] && die "Usage: save_config <files>"
- local configfile
- if [[ -n ${_SAVEDCONFIG_CONFIGURATION_FILE} ]] ; then
- configfile="/etc/portage/savedconfig/${_SAVEDCONFIG_CONFIGURATION_FILE}"
- else
- configfile="/etc/portage/savedconfig/${CATEGORY}/${PF}"
- fi
+ local configfile="/etc/portage/savedconfig/${CATEGORY}/${PF}"
if [[ $# -eq 1 && -f $1 ]] ; then
# Just one file, so have the ${configfile} be that config file
@@ -125,7 +113,6 @@ restore_config() {
if [[ -r "${configfile}" ]] ; then
einfo "Found \"${configfile}\""
found=${configfile}
- _SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/}
break
fi