Skip to content
This repository has been archived by the owner on Sep 6, 2019. It is now read-only.

Commit

Permalink
Merge branch 'release/0.3.2'
Browse files Browse the repository at this point in the history
  • Loading branch information
sergei-maertens committed Nov 2, 2015
2 parents e0421a7 + 64b8712 commit 48c2689
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 3 deletions.
1 change: 1 addition & 0 deletions .gitignore
Expand Up @@ -5,6 +5,7 @@ __pycache__
/dist
.eggs
*.egg-info
/build

# tests
.tox
Expand Down
4 changes: 4 additions & 0 deletions Changelog.rst
@@ -1,6 +1,10 @@
Changelog
=========

0.3.2
-----
Fixed incorrect passing of the --log option.

0.3.1
-----

Expand Down
2 changes: 1 addition & 1 deletion systemjs/__init__.py
@@ -1 +1 @@
__version__ = '0.3.1'
__version__ = '0.3.2'
2 changes: 1 addition & 1 deletion systemjs/base.py
Expand Up @@ -61,7 +61,7 @@ def command(self, command):
self.version = self.get_jspm_version(options)
try:
if self._has_jspm_log():
command += ' --log={log}'
command += ' --log {log}'
options.setdefault('log', 'err')

cmd = command.format(app=self.app, outfile=outfile, **options)
Expand Down
2 changes: 1 addition & 1 deletion tests/tests/test_bundle.py
Expand Up @@ -176,7 +176,7 @@ def side_effect(*args, **kwargs):
self.assertEqual(
command,
mock.call(
'jspm bundle {0} {1} --log=err'.format(app_name, outfile),
'jspm bundle {0} {1} --log err'.format(app_name, outfile),
stderr=subprocess.PIPE, stdout=subprocess.PIPE, stdin=subprocess.PIPE,
shell=True, cwd=None
)
Expand Down

0 comments on commit 48c2689

Please sign in to comment.