[gentoo-commits] proj/portage:master commit in: bin/

[Sam James]

commit:     9100037d5c3c78ba70e394098164143616758e98
Author:     Kerin Millar <kfm <AT> plushkava <DOT> net>
AuthorDate: Mon Jun 23 03:07:08 2025 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Jun 23 10:37:11 2025 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=9100037d

emerge-webrsync: don't run emerge --metadata if invoked by portage

Presently, the sync_local() function executes emerge --metadata,
provided that the 'FEATURES' variable contains "metadata-transfer".
While it might make sense to do so in the case that the user executes
emerge-webrsync directly, it does not in the case that emerge-webrsync
is executed by portage - as will happen if "sync-type = webrsync" is in
effect for the gentoo repo.

Address the issue by refraining from executing emerge --metadata where
emerge-webrsync is determined to have been invoked by portage.

See-also: 07771a73265cc2611428a3bd4f7d468d987e6168
Signed-off-by: Kerin Millar <kfm <AT> plushkava.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>

 bin/emerge-webrsync | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index 8e7db13602..c012160135 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -429,7 +429,7 @@ sync_local() {
                fi
        fi
 
-       if contains_word metadata-transfer "${FEATURES}"; then
+       if (( ! from_portage )) && contains_word metadata-transfer 
"${FEATURES}"; then
                einfo "Updating cache ..."
                "${emerge}" --metadata
        fi