Skip to content

Commit

Permalink
Divert stderr to stdout when checking other versions.
Browse files Browse the repository at this point in the history
  • Loading branch information
Katharine committed Aug 30, 2016
1 parent 9e53dca commit 3ca3a84
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions pebble_tool/sdk/requirements.py
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ def _qemu_version(self):
if 'qemu' not in self._version_cache:
qemu_path = os.environ.get('PEBBLE_QEMU_PATH', 'qemu-pebble')
try:
result = subprocess.check_output([qemu_path, '--version'])
result = subprocess.check_output([qemu_path, '--version'], stderr=subprocess.STDOUT)
except (subprocess.CalledProcessError, OSError):
version = None
else:
Expand All @@ -70,7 +70,7 @@ def _pypkjs_version(self):
if 'pypkjs' not in self._version_cache:
pypkjs_path = os.environ.get('PHONESIM_PATH', 'phonesim.py')
try:
result = subprocess.check_output([sys.executable, pypkjs_path, '--version'])
result = subprocess.check_output([sys.executable, pypkjs_path, '--version'], stderr=subprocess.STDOUT)
except subprocess.CalledProcessError:
version = '1.0.4' # The version before we started including version numbers.
except OSError:
Expand Down

0 comments on commit 3ca3a84

Please sign in to comment.