LBRYCommunity/buildozer
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #970 from kivy/fix/display_license

Browse source 
fix: show output of sdk update if auto_accept_license is false
This commit is contained in:
Gabriel Pettier 2019-09-17 10:56:25 +02:00 committed by GitHub
parent 2af534652d fa117686c8
commit e58ad280bd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
buildozer/targets/android.py
View file

@ -515,6 +515,7 @@ class TargetAndroid(Target):
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,
@ -523,7 +524,10 @@ class TargetAndroid(Target):
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 = []