From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id A5CF513877A for ; Tue, 2 Sep 2014 02:43:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 66750E0C21; Tue, 2 Sep 2014 02:43:46 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C8726E0C1F for ; Tue, 2 Sep 2014 02:43:45 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6B81533F8BC for ; Tue, 2 Sep 2014 02:43:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0F1F247BA for ; Tue, 2 Sep 2014 02:43:43 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1409622060.1a2e4242eb2297cae7e5305cb62c22c8ab0f8fbb.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:pending commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/chroot-functions.sh X-VCS-Directories: targets/support/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 1a2e4242eb2297cae7e5305cb62c22c8ab0f8fbb X-VCS-Branch: pending Date: Tue, 2 Sep 2014 02:43:43 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8e7dd46b-0b4c-44d1-b8e4-77c6dd8c7d0a X-Archives-Hash: 343a1ecf425156e3e9dc4160cd89bc2e commit: 1a2e4242eb2297cae7e5305cb62c22c8ab0f8fbb Author: Brian Dolbec gentoo org> AuthorDate: Mon Sep 1 19:32:22 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Tue Sep 2 01:41:00 2014 +0000 URL: http://sources.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=1a2e4242 chroot-functions.sh: Fix a mis-worded comment Fixes: 900554b0b067e76d3806e520357d91adbfa4fa0c Author: Jorge Manuel B. S. Vicetto (jmbsvicetto) gentoo.org> (Mon 19 Dec 2011 11:14:05 PM PST) subject: Make sure portage updates itself at the start of stage1 - thanks to Zac for noticing the issue. --- targets/support/chroot-functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh index ce56157..3495f14 100755 --- a/targets/support/chroot-functions.sh +++ b/targets/support/chroot-functions.sh @@ -169,7 +169,7 @@ setup_pkgmgr(){ # We need to merge our package manager with USE="build" set in case it is # portage to avoid frying our /etc/portage/make.conf file. Otherwise, we could # just let emerge @system could merge it. - # Use --update or portage won't reinstall the same version. + # Use --update or portage will reinstall the same version. [ -e /etc/portage/make.conf ] && echo 'USE="${USE} build"' >> /etc/portage/make.conf run_merge --oneshot --update sys-apps/portage sed -i '/USE="${USE} build"/d' /etc/portage/make.conf