emerge-webrsync, sync: webrsync: drop no-op refresh

Now that we use gemato even for portage->emerge-webrsync calls,
this refresh doesn't do anything as gemato handles it by itself.

This effectively reverts 197799592b34c2c8e31dee25c61f0ca6dc7b2f11.

Bug: https://bugs.gentoo.org/905358
Signed-off-by: Sam James <sam@gentoo.org>

2 files changed, 7 insertions, 29 deletions

diff --git a/bin/emerge-webrsync b/bin/emerge-webrsync
index f1fb012c2..b953624d4 100755
--- a/bin/emerge-webrsync
+++ b/bin/emerge-webrsync
@@ -290,10 +290,6 @@ check_file_signature_gemato() {
 		)
 
 		[[ -n ${PORTAGE_GPG_KEY_SERVER} ]] && gemato_args+=( --keyserver "${PORTAGE_GPG_KEY_SERVER}" )
-		# Portage is calling us so it'll handle refreshing if configured to do so.
-		# Don't repeat its work.
-		[[ -n ${PORTAGE_TEMP_GPG_DIR} ]] && gemato_args+=( --no-refresh-keys --no-wkd )
-
 		[[ ${PORTAGE_QUIET} == 1 ]] && gemato_args+=( --quiet )
 		[[ ${do_debug} == 1 ]] && gemato_args+=( --debug )
 
diff --git a/lib/portage/sync/modules/webrsync/webrsync.py b/lib/portage/sync/modules/webrsync/webrsync.py
index 093efe8b0..2c65486d0 100644
--- a/lib/portage/sync/modules/webrsync/webrsync.py
+++ b/lib/portage/sync/modules/webrsync/webrsync.py
@@ -5,7 +5,6 @@ import logging
 import portage
 from portage import os
 from portage.util import writemsg_level
-from portage.util.futures import asyncio
 from portage.output import create_color_func
 from portage.sync.syncbase import SyncBase
 
@@ -14,7 +13,6 @@ bad = create_color_func("BAD")
 warn = create_color_func("WARN")
 
 try:
-    from gemato.exceptions import GematoException
     import gemato.openpgp
 except ImportError:
     gemato = None
@@ -99,29 +97,13 @@ class WebRsync(SyncBase):
                     )
                     return (1, False)
 
-                openpgp_env = self._get_openpgp_env(self.repo.sync_openpgp_key_path)
-
-                out = portage.output.EOutput(quiet=quiet)
-                try:
-                    out.einfo(f"Using keys from {self.repo.sync_openpgp_key_path}")
-                    with open(self.repo.sync_openpgp_key_path, "rb") as f:
-                        openpgp_env.import_key(f)
-                    self._refresh_keys(openpgp_env)
-                    self.spawn_kwargs["env"]["PORTAGE_GPG_DIR"] = openpgp_env.home
-                    self.spawn_kwargs["env"]["PORTAGE_TEMP_GPG_DIR"] = openpgp_env.home
-                    self.spawn_kwargs["env"][
-                        "PORTAGE_GPG_KEY"
-                    ] = self.repo.sync_openpgp_key_path
-                    self.spawn_kwargs["env"][
-                        "PORTAGE_GPG_KEY_SERVER"
-                    ] = self.repo.sync_openpgp_key_server
-                except (GematoException, asyncio.TimeoutError) as e:
-                    writemsg_level(
-                        f"!!! Verification impossible due to keyring problem:\n{e}\n",
-                        level=logging.ERROR,
-                        noiselevel=-1,
-                    )
-                    return (1, False)
+                self.spawn_kwargs["env"]["PORTAGE_SYNC_WEBRSYNC_GPG"] = True
+                self.spawn_kwargs["env"][
+                    "PORTAGE_GPG_KEY"
+                ] = self.repo.sync_openpgp_key_path
+                self.spawn_kwargs["env"][
+                    "PORTAGE_GPG_KEY_SERVER"
+                ] = self.repo.sync_openpgp_key_server
 
             webrsync_cmd = [self.bin_command]
             if verbose: