adjust patcher

anaconda · Nov 21, 2024 · 2628a19 · 2628a19
1 parent 0727468
commit 2628a19
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/anaconda_anon_usage/patch.py b/anaconda_anon_usage/patch.py
@@ -35,9 +35,10 @@ def _new_user_agent(ctx):
 def _new_apply_basic_auth(request):
     assert CondaHttpAuth is not None
     result = CondaHttpAuth._old_apply_basic_auth(request)
-    auth_token = auth_string(request.url, context.anaconda_anon_usage)
-    if auth_token and "X-Auth" not in request.headers:
-        request.headers["X-Auth"] = auth_token
+    if "X-Auth" not in request.headers:
+        auth_token = auth_string(request.url, context.anaconda_anon_usage)
+        if auth_token:
+            request.headers["X-Auth"] = auth_token
     return result
 
 

diff --git a/anaconda_anon_usage/tokens.py b/anaconda_anon_usage/tokens.py
@@ -130,7 +130,7 @@ def auth_string(url, enabled=True):
     if debug_token:
         all_tokens = {
             "https://anaconda.cloud/": debug_token,
-            "https://conda.anaconda.org/": debug_token + -"wrong",
+            "https://conda.anaconda.org/": debug_token + "-wrong",
         }
     for t_url, t_val in all_tokens.items():
         match = re.match(