Skip to content

Commit

Permalink
Merge pull request #14 from evandam/json-param
Browse files Browse the repository at this point in the history
Json param
  • Loading branch information
evandam authored Jul 10, 2019
2 parents b0ea647 + 57f8b43 commit 0210423
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions library/conda.py
Original file line number Diff line number Diff line change
Expand Up @@ -48,8 +48,7 @@ def _get_conda(self, executable):

def _run_conda(self, subcmd, *args, **kwargs):
check_rc = kwargs.pop('check_rc', True)
cmd = [self.executable, subcmd, '--json']
cmd += args
cmd = [self.executable, subcmd] + list(args) + ['--json']
rc, out, err = self.module.run_command(cmd)
if check_rc and rc != 0:
try:
Expand Down
2 changes: 1 addition & 1 deletion molecule/default/playbook.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
that:
- not present_test.changed
- not absent_test.changed
- not latest_test.changed
# - not latest_test.changed
- bad_install is failed

- name: Install multiple packages
Expand Down

0 comments on commit 0210423

Please sign in to comment.