Gentoo Archives: gentoo-commits

From: Thomas Deutschmann <whissi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Thu, 08 Aug 2019 19:47:56
Message-Id: 1565293662.8191665432dca1d6cc289185cf7fe32aee0646db.whissi@gentoo
1 commit: 8191665432dca1d6cc289185cf7fe32aee0646db
2 Author: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 3 12:42:09 2019 +0000
4 Commit: Thomas Deutschmann <whissi <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 8 19:47:42 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81916654
7
8 savedconfig.eclass: Always quote filename in output
9
10 Signed-off-by: Thomas Deutschmann <whissi <AT> gentoo.org>
11
12 eclass/savedconfig.eclass | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15 diff --git a/eclass/savedconfig.eclass b/eclass/savedconfig.eclass
16 index f62a6055ffd..1ea464271af 100644
17 --- a/eclass/savedconfig.eclass
18 +++ b/eclass/savedconfig.eclass
19 @@ -128,14 +128,14 @@ restore_config() {
20 fi
21 done
22 if [[ -f ${found} ]]; then
23 - elog "Building using saved configfile ${found}"
24 + elog "Building using saved configfile \"${found}\""
25 if [ $# -gt 0 ]; then
26 cp -pPR "${found}" "$1" || die "Failed to restore ${found} to $1"
27 else
28 die "need to know the restoration filename"
29 fi
30 elif [[ -d ${found} ]]; then
31 - elog "Building using saved config directory ${found}"
32 + elog "Building using saved config directory \"${found}\""
33 local dest=${PWD}
34 pushd "${found}" > /dev/null
35 treecopy . "${dest}" || die "Failed to restore ${found} to $1"
36 @@ -147,7 +147,7 @@ restore_config() {
37 die "Reading config files failed"
38 fi
39 ewarn "No saved config to restore - please remove USE=savedconfig or"
40 - ewarn "provide a configuration file in ${PORTAGE_CONFIGROOT}/etc/portage/savedconfig/${CATEGORY}/${PN}"
41 + ewarn "provide a configuration file in ${PORTAGE_CONFIGROOT%/}/etc/portage/savedconfig/${CATEGORY}/${PN}"
42 ewarn "Your config file(s) will not be used this time"
43 fi
44 }