From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RYk02-0007Fo-IQ for garchives@archives.gentoo.org; Thu, 08 Dec 2011 19:51:22 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CE87B21C165; Thu, 8 Dec 2011 19:51:14 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 9BFCD21C165 for ; Thu, 8 Dec 2011 19:51:14 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 26A711B4024 for ; Thu, 8 Dec 2011 19:51:14 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 70EEF80042 for ; Thu, 8 Dec 2011 19:51:13 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/etc-update X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: b79dd09c523764f95be882fe1a5afde71cbab81c Date: Thu, 8 Dec 2011 19:51:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: cd5ed9bf-6152-49e2-bfb8-bcb91d97d737 X-Archives-Hash: 46893b4153997e8118ad4874235d29a4 commit: b79dd09c523764f95be882fe1a5afde71cbab81c Author: Zac Medico gentoo org> AuthorDate: Thu Dec 8 19:51:06 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Dec 8 19:51:06 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3Db79dd09c etc-update: use PORTAGE_INST_UID/GID --- bin/etc-update | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/bin/etc-update b/bin/etc-update index 5a7ba2a..731b648 100755 --- a/bin/etc-update +++ b/bin/etc-update @@ -537,7 +537,8 @@ ${SET_X} && set -x =20 type portageq > /dev/null || exit $? eval $(portageq envvar -v CONFIG_PROTECT \ - CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_TMPDIR EROOT USERLAND) + CONFIG_PROTECT_MASK PORTAGE_CONFIGROOT PORTAGE_INST_GID PORTAGE_INST_UI= D \ + PORTAGE_TMPDIR EROOT USERLAND) export PORTAGE_TMPDIR =20 TMP=3D"${PORTAGE_TMPDIR}/etc-update-$$" @@ -554,7 +555,8 @@ rm -rf "${TMP}" 2> /dev/null mkdir "${TMP}" || die "failed to create temp dir" 1 # make sure we have a secure directory to work in chmod 0700 "${TMP}" || die "failed to set perms on temp dir" 1 -chown ${UID:-0}:${GID:-0} "${TMP}" || die "failed to set ownership on te= mp dir" 1 +chown ${PORTAGE_INST_UID:-0}:${PORTAGE_INST_GID:-0} "${TMP}" || \ + die "failed to set ownership on temp dir" 1 =20 # I need the CONFIG_PROTECT value #CONFIG_PROTECT=3D$(/usr/lib/portage/bin/portageq envvar CONFIG_PROTECT)