Skip to content

Commit

Permalink
json
Browse files Browse the repository at this point in the history
  • Loading branch information
HugoTian committed Aug 17, 2016
1 parent 0c5afb2 commit 29722b0
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion conda/cli/main_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -386,7 +386,7 @@ def execute_config(args, parser):
del rc_config[key]

# config.rc_keys
with open(rc_path, 'w+') as rc:
with open(rc_path, 'w') as rc:
rc.write(yaml_dump(rc_config))

if args.json:
Expand Down
8 changes: 4 additions & 4 deletions tests/test_priority.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@ def test_channel_order_channel_priority_true(self):
assert_package_is_installed(prefix, 'pycosat')

# add conda-forge channel
run_command(Commands.CONFIG, prefix, "--prepend channels conda-forge")
o, e = run_command(Commands.CONFIG, prefix, "--prepend channels conda-forge", '--json')

assert context.channels == ("conda-forge", "defaults"), prefix
assert context.channels == ("conda-forge", "defaults"), o + e
# update --all
update_stdout, _ = run_command(Commands.UPDATE, prefix, '--all')

Expand All @@ -41,8 +41,8 @@ def test_channel_priority_update(self):
assert_package_is_installed(prefix, 'python')

# add conda-forge channel
run_command(Commands.CONFIG, prefix, "--prepend channels conda-forge")
assert context.channels == ("conda-forge", "defaults"), prefix
o,e = run_command(Commands.CONFIG, prefix, "--prepend channels conda-forge", '--json')
assert context.channels == ("conda-forge", "defaults"), o+e

# update python
update_stdout, _ = run_command(Commands.UPDATE, prefix, 'python')
Expand Down

0 comments on commit 29722b0

Please sign in to comment.