Gentoo Archives: gentoo-commits

From: Brian Dolbec <dolsen@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/stage1/
Date: Tue, 01 Sep 2015 05:59:02
Message-Id: 1440962881.656e4c20b3520ed243817425b92c5175391ffca7.dolsen@gentoo
1 commit: 656e4c20b3520ed243817425b92c5175391ffca7
2 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo <DOT> org>
3 AuthorDate: Sun Aug 30 19:28:01 2015 +0000
4 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
5 CommitDate: Sun Aug 30 19:28:01 2015 +0000
6 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=656e4c20
7
8 Add missing '"' and replace '' in strings so we get interpolation.
9
10 Signed-off-by: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org>
11
12 targets/stage1/stage1-chroot.sh | 4 ++--
13 1 file changed, 2 insertions(+), 2 deletions(-)
14
15 diff --git a/targets/stage1/stage1-chroot.sh b/targets/stage1/stage1-chroot.sh
16 index ebd6551..2853f04 100755
17 --- a/targets/stage1/stage1-chroot.sh
18 +++ b/targets/stage1/stage1-chroot.sh
19 @@ -28,7 +28,7 @@ clst_root_path=/ setup_pkgmgr "build"
20 if [ -n "${clst_update_seed}" ]; then
21 if [ "${clst_update_seed}" == "yes" ]; then
22 # Set USE flags build and bindist if clst_BINDIST is set
23 - [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build ${BINDIST}" >> ${clst_make_conf}
24 + [ -e ${clst_make_conf} ] && echo "USE=\"${USE} build ${BINDIST}\"" >> ${clst_make_conf}
25
26 echo "Updating seed stage..."
27 if [ -n "${clst_update_seed_command}" ]; then
28 @@ -55,7 +55,7 @@ make_destpath /tmp/stage1root
29
30 ## START BUILD
31 # First, we drop in a known-good baselayout
32 -[ -e ${clst_make_conf} ] && echo 'USE="${USE} -build"' >> ${clst_make_conf}
33 +[ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
34 run_merge "--oneshot --nodeps sys-apps/baselayout"
35 sed -i "/USE=\"${USE} -build\"/d" ${clst_make_conf}