Merge pull request #12941 from conda/23.7.x

conda · Jul 31, 2023 · df7c74b · df7c74b
2 parents 1b3f8a2 + b63f152
commit df7c74b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 3 deletions.
diff --git a/.authors.yml b/.authors.yml
@@ -1957,7 +1957,7 @@
   first_commit: 2016-12-11 16:14:03
 - name: Ken Odegard
   email: kodegard@anaconda.com
-  num_commits: 552
+  num_commits: 554
   first_commit: 2016-09-27 18:04:21
   github: kenodegard
   aliases:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,17 @@
 [//]: # (current developments)
 
+## 23.7.2 (2023-07-27)
+
+### Bug fixes
+
+* Fix regression in parsing `--json` and `--debug` flags for executable plugins. (#12935, #12936)
+
+### Contributors
+
+* @kenodegard
+
+
+
 ## 23.7.1 (2023-07-26)
 
 ### Bug fixes

diff --git a/conda/cli/main.py b/conda/cli/main.py
@@ -39,7 +39,7 @@ def main_subshell(*args, post_parse_hook=None, **kwargs):
     args = args or ["--help"]
 
     pre_parser = generate_pre_parser(add_help=False)
-    pre_args, unknown = pre_parser.parse_known_args(args)
+    pre_args, _ = pre_parser.parse_known_args(args)
 
     # the arguments that we want to pass to the main parser later on
     override_args = {"json": pre_args.json, "debug": pre_args.debug}
@@ -52,7 +52,7 @@ def main_subshell(*args, post_parse_hook=None, **kwargs):
     context.__init__(argparse_args=pre_args)
 
     parser = generate_parser(add_help=True)
-    args = parser.parse_args(unknown, override_args=override_args, namespace=pre_args)
+    args = parser.parse_args(args, override_args=override_args, namespace=pre_args)
 
     context.__init__(argparse_args=args)
     init_loggers(context)