Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/support/
Date: Tue, 02 Sep 2014 02:43:47
Message-Id: 1409622060.1a2e4242eb2297cae7e5305cb62c22c8ab0f8fbb.dol-sen@gentoo
1 commit: 1a2e4242eb2297cae7e5305cb62c22c8ab0f8fbb
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 1 19:32:22 2014 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Tue Sep 2 01:41:00 2014 +0000
6 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1a2e4242
7
8 chroot-functions.sh: Fix a mis-worded comment
9
10 Fixes: 900554b0b067e76d3806e520357d91adbfa4fa0c
11 Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) <jmbsvicetto <AT> gentoo.org> (Mon 19 Dec 2011 11:14:05 PM PST)
12 subject: Make sure portage updates itself at the start of stage1 - thanks to Zac for noticing the issue.
13
14 ---
15 targets/support/chroot-functions.sh | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18 diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
19 index ce56157..3495f14 100755
20 --- a/targets/support/chroot-functions.sh
21 +++ b/targets/support/chroot-functions.sh
22 @@ -169,7 +169,7 @@ setup_pkgmgr(){
23 # We need to merge our package manager with USE="build" set in case it is
24 # portage to avoid frying our /etc/portage/make.conf file. Otherwise, we could
25 # just let emerge @system could merge it.
26 - # Use --update or portage won't reinstall the same version.
27 + # Use --update or portage will reinstall the same version.
28 [ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf
29 run_merge --oneshot --update sys-apps/portage
30 sed -i '/USE="${USE} build"/d' /etc/portage/make.conf