Skip to content

Commit

Permalink
Merge pull request #970 from kivy/fix/display_license
Browse files Browse the repository at this point in the history
fix: show output of sdk update if auto_accept_license is false
  • Loading branch information
tshirtman committed Sep 17, 2019
2 parents 2af5346 + fa11768 commit e58ad28
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion buildozer/targets/android.py
Original file line number Diff line number Diff line change
Expand Up @@ -515,6 +515,7 @@ def _android_update_sdk(self, *sdkmanager_commands):
auto_accept_license = self.buildozer.config.getbooldefault(
'app', 'android.accept_sdk_license', False)

kwargs = {}
if auto_accept_license:
# `SIGPIPE` is not being reported somehow, but `EPIPE` is.
# This leads to a stderr "Broken pipe" message which is harmless,
Expand All @@ -523,7 +524,10 @@ def _android_update_sdk(self, *sdkmanager_commands):
command = '{} | {} --licenses'.format(
yes_command, self.sdkmanager_path)
self.buildozer.cmd(command, cwd=self.android_sdk_dir)
self._sdkmanager(*sdkmanager_commands)
else:
kwargs['show_output'] = True

self._sdkmanager(*sdkmanager_commands, **kwargs)

def _read_version_subdir(self, *args):
versions = []
Expand Down

0 comments on commit e58ad28

Please sign in to comment.