From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1711192-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 1076D15813A
for <garchives@archives.gentoo.org>; Tue, 21 Jan 2025 21:02:56 +0000 (UTC)
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
(Authenticated sender: relay-lists.gentoo.org@gentoo.org)
by smtp.gentoo.org (Postfix) with ESMTPSA id 7F63E340CA7
for <garchives@archives.gentoo.org>; Tue, 21 Jan 2025 21:02:55 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 91E82E0207;
Tue, 21 Jan 2025 21:02:46 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 6FF5FE0207
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Jan 2025 21:02:46 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id D7D6033BEED
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Jan 2025 21:02:42 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 4195997F
for <gentoo-commits@lists.gentoo.org>; Tue, 21 Jan 2025 21:02:41 +0000 (UTC)
From: "Sam James" <sam@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" <sam@gentoo.org>
Message-ID: <1737493354.04c5358b8b4b38a3c73cfd743a205bb7b40c0a21.sam@gentoo>
Subject: [gentoo-commits] proj/portage:master commit in: bin/
X-VCS-Repository: proj/portage
X-VCS-Files: bin/emerge-webrsync
X-VCS-Directories: bin/
X-VCS-Committer: sam
X-VCS-Committer-Name: Sam James
X-VCS-Revision: 04c5358b8b4b38a3c73cfd743a205bb7b40c0a21
X-VCS-Branch: master
Date: Tue, 21 Jan 2025 21:02:41 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 98289489-81f9-4221-b02f-2ec381080025
X-Archives-Hash: b1154ca06f24f2561a19b3a92b530aa7
commit: 04c5358b8b4b38a3c73cfd743a205bb7b40c0a21
Author: David Sardari <d <AT> duxsco <DOT> de>
AuthorDate: Tue Jan 21 20:27:16 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 21 21:02:34 2025 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=04c5358b
emerge-webrsync: Use variables PORTAGE_USERNAME and PORTAGE_GRPNAME
Both variables default to "portage" according to "man 5 make.conf"
and should be used instead of hardcoding "portage" user.
Bug: https://bugs.gentoo.org/707980
Signed-off-by: David Sardari <d <AT> duxsco.de>
Signed-off-by: Sam James <sam <AT> gentoo.org>
bin/emerge-webrsync | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index caa4986da2..c135fd9c62 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -83,6 +83,7 @@ eval "$("${portageq}" envvar -v DISTDIR EPREFIX FEATURES \
PORTAGE_BIN_PATH PORTAGE_CONFIGROOT PORTAGE_GPG_DIR \
PORTAGE_NICENESS PORTAGE_REPOSITORIES PORTAGE_RSYNC_EXTRA_OPTS \
PORTAGE_RSYNC_OPTS PORTAGE_TEMP_GPG_DIR PORTAGE_TMPDIR \
+ PORTAGE_USERNAME PORTAGE_GRPNAME \
USERLAND http_proxy https_proxy ftp_proxy)"
export http_proxy https_proxy ftp_proxy
@@ -410,7 +411,7 @@ sync_local() {
[[ ${PORTAGE_QUIET} -eq 1 ]] || einfo "Syncing local repository ..."
- local ownership="portage:portage"
+ local ownership="${PORTAGE_USERNAME}:${PORTAGE_GRPNAME}"
if has usersync ${FEATURES} ; then
case "${USERLAND}" in
BSD)