Gentoo Archives: gentoo-dev

From: Mike Gilbert <floppym@g.o>
To: gentoo-dev@l.g.o
Cc: Mike Gilbert <floppym@g.o>
Subject: [gentoo-dev] [PATCH] savedconfig.eclass: do not re-use config file scheme
Date: Sun, 31 Oct 2021 19:21:34
Message-Id: 20211031192038.50241-1-floppym@gentoo.org
1 This causes file collisions when save_config is used in a multi-slotted
2 package and the config file is named ${PN}.
3
4 Reverts: a0c35ad8ee8f8f89ba6044dd5b44e9479c6a1775
5 Bug: https://bugs.gentoo.org/686348
6 Closes: https://bugs.gentoo.org/818904
7 Signed-off-by: Mike Gilbert <floppym@g.o>
8 ---
9 eclass/savedconfig.eclass | 15 +--------------
10 1 file changed, 1 insertion(+), 14 deletions(-)
11
12 diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
13 index c4fd0c492f4..c7aa8084ac8 100644
14 --- a/eclass/savedconfig.eclass
15 +++ b/eclass/savedconfig.eclass
16 @@ -39,13 +39,6 @@ case ${EAPI} in
17 *) die "EAPI=${EAPI:-0} is not supported" ;;
18 esac
19
20 -# @ECLASS-VARIABLE: _SAVEDCONFIG_CONFIGURATION_FILE
21 -# @DEFAULT_UNSET
22 -# @INTERNAL
23 -# @DESCRIPTION:
24 -# Path of configuration file, relative to /etc/portage/savedconfig,
25 -# restored by restore_config() and saved by save_config().
26 -
27 # @FUNCTION: save_config
28 # @USAGE: <config files to save>
29 # @DESCRIPTION:
30 @@ -59,12 +52,7 @@ save_config() {
31 fi
32 [[ $# -eq 0 ]] && die "Usage: save_config <files>"
33
34 - local configfile
35 - if [[ -n ${_SAVEDCONFIG_CONFIGURATION_FILE} ]] ; then
36 - configfile="/etc/portage/savedconfig/${_SAVEDCONFIG_CONFIGURATION_FILE}"
37 - else
38 - configfile="/etc/portage/savedconfig/${CATEGORY}/${PF}"
39 - fi
40 + local configfile"/etc/portage/savedconfig/${CATEGORY}/${PF}"
41
42 if [[ $# -eq 1 && -f $1 ]] ; then
43 # Just one file, so have the ${configfile} be that config file
44 @@ -125,7 +113,6 @@ restore_config() {
45 if [[ -r "${configfile}" ]] ; then
46 einfo "Found \"${configfile}\""
47 found=${configfile}
48 - _SAVEDCONFIG_CONFIGURATION_FILE=${configfile#${base}/}
49 break
50 fi
51
52 --
53 2.33.1