Skip to content

Commit

Permalink
Merge pull request #12941 from conda/23.7.x
Browse files Browse the repository at this point in the history
  • Loading branch information
kenodegard committed Jul 31, 2023
2 parents 1b3f8a2 + b63f152 commit df7c74b
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 3 deletions.
2 changes: 1 addition & 1 deletion .authors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions conda/cli/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand All @@ -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)
Expand Down

0 comments on commit df7c74b

Please sign in to comment.