From 0006a12d5d8aaf07e97dc797aa5c512b59202879 Mon Sep 17 00:00:00 2001
From: Masen Furer <m_github@0x26.net>
Date: Mon, 16 Jan 2023 09:05:15 -0800
Subject: Fix regression with multiple env substitutions for the same key
 (#2873)

Fix https://github.com/tox-dev/tox/issues/2869
---
 src/tox/config/loader/ini/replace.py | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'src/tox')

diff --git a/src/tox/config/loader/ini/replace.py b/src/tox/config/loader/ini/replace.py
index d856277c..40730ca5 100644
--- a/src/tox/config/loader/ini/replace.py
+++ b/src/tox/config/loader/ini/replace.py
@@ -178,29 +178,32 @@ class Replacer:
         return "".join(self(value))
 
     def _replace_match(self, value: MatchExpression) -> str:
+        # use a copy of conf_args so any changes from this replacement do NOT
+        # affect adjacent substitutions (#2869)
+        conf_args = self.conf_args.copy()
         of_type, *args = flattened_args = [self.join(arg) for arg in value.expr]
         if of_type == "/":
             replace_value: str | None = os.sep
         elif of_type == "" and args == [""]:
             replace_value = os.pathsep
         elif of_type == "env":
-            replace_value = replace_env(self.conf, args, self.conf_args)
+            replace_value = replace_env(self.conf, args, conf_args)
         elif of_type == "tty":
             replace_value = replace_tty(args)
         elif of_type == "posargs":
-            replace_value = replace_pos_args(self.conf, args, self.conf_args)
+            replace_value = replace_pos_args(self.conf, args, conf_args)
         else:
             replace_value = replace_reference(
                 self.conf,
                 self.loader,
                 ARG_DELIMITER.join(flattened_args),
-                self.conf_args,
+                conf_args,
             )
         if replace_value is not None:
             needs_expansion = any(isinstance(m, MatchExpression) for m in find_replace_expr(replace_value))
             if needs_expansion:
                 try:
-                    return replace(self.conf, self.loader, replace_value, self.conf_args, self.depth + 1)
+                    return replace(self.conf, self.loader, replace_value, conf_args, self.depth + 1)
                 except MatchRecursionError as err:
                     LOGGER.warning(str(err))
                     return replace_value
-- 
cgit v1.2.1