Gentoo Archives: gentoo-dev

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-dev@l.g.o
Cc: Arfrever@××××××.Org, base-system@g.o
Subject: [gentoo-dev] [PATCH 2/3] savedconfig.eclass: Always quote filename in output
Date: Sat, 03 Aug 2019 13:19:02
Message-Id: 20190803131759.37037-2-whissi@gentoo.org
In Reply to: [gentoo-dev] [PATCH 1/3] savedconfig.eclass: Make save_config() re-use configuration file scheme used by restore_config() by Thomas Deutschmann
1 Signed-off-by: Thomas Deutschmann <whissi@g.o>
2 ---
3 eclass/savedconfig.eclass | 6 +++---
4 1 file changed, 3 insertions(+), 3 deletions(-)
5
6 diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
7 index b96f55d4c27c..5c6fd228269c 100644
8 --- a/eclass/savedconfig.eclass
9 +++ b/eclass/savedconfig.eclass
10 @@ -128,14 +128,14 @@ restore_config() {
11 fi
12 done
13 if [[ -f ${found} ]]; then
14 - elog "Building using saved configfile ${found}"
15 + elog "Building using saved configfile \"${found}\""
16 if [ $# -gt 0 ]; then
17 cp -pPR "${found}" "$1" || die "Failed to restore ${found} to $1"
18 else
19 die "need to know the restoration filename"
20 fi
21 elif [[ -d ${found} ]]; then
22 - elog "Building using saved config directory ${found}"
23 + elog "Building using saved config directory \"${found}\""
24 local dest=${PWD}
25 pushd "${found}" > /dev/null
26 treecopy . "${dest}" || die "Failed to restore ${found} to $1"
27 @@ -147,7 +147,7 @@ restore_config() {
28 die "Reading config files failed"
29 fi
30 ewarn "No saved config to restore - please remove USE=savedconfig or"
31 - ewarn "provide a configuration file in ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PN}"
32 + ewarn "provide a configuration file in ${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig/${CATEGORY}/${PN}"
33 ewarn "Your config file(s) will not be used this time"
34 fi
35 }
36 --
37 2.22.0

Replies