mirror of
https://github.com/ansible-collections/community.general.git
synced 2025-04-18 00:11:26 -07:00
adds check for non-accepted licenses
This commit is contained in:
parent
9b3d4449b9
commit
ece03d17ce
1 changed files with 13 additions and 3 deletions
|
@ -82,6 +82,8 @@ class AndroidSdkManager(object):
|
||||||
_RE_UPDATABLE_PACKAGE = re.compile(r'^\s*(?P<name>\S+)\s*\|\s*\S+\s*\|\s*\S+\s*$')
|
_RE_UPDATABLE_PACKAGE = re.compile(r'^\s*(?P<name>\S+)\s*\|\s*\S+\s*\|\s*\S+\s*$')
|
||||||
|
|
||||||
_RE_UNKNOWN_PACKAGE = re.compile(r'^Warning: Failed to find package \'(?P<package>\S+)\'\s*$')
|
_RE_UNKNOWN_PACKAGE = re.compile(r'^Warning: Failed to find package \'(?P<package>\S+)\'\s*$')
|
||||||
|
_RE_ACCEPT_LICENSE = re.compile(r'^The following packages can not be installed since their licenses or those of '
|
||||||
|
r'the packages they depend on were not accepted')
|
||||||
|
|
||||||
def __init__(self, runner):
|
def __init__(self, runner):
|
||||||
self.runner = runner
|
self.runner = runner
|
||||||
|
@ -128,7 +130,6 @@ class AndroidSdkManager(object):
|
||||||
|
|
||||||
def _try_parse_stderr(self, stderr):
|
def _try_parse_stderr(self, stderr):
|
||||||
data = stderr.split('\n')
|
data = stderr.split('\n')
|
||||||
|
|
||||||
for line in data:
|
for line in data:
|
||||||
unknown_package_regex = self._RE_UNKNOWN_PACKAGE.match(line)
|
unknown_package_regex = self._RE_UNKNOWN_PACKAGE.match(line)
|
||||||
if unknown_package_regex:
|
if unknown_package_regex:
|
||||||
|
@ -145,8 +146,17 @@ class AndroidSdkManager(object):
|
||||||
if len(packages) == 0:
|
if len(packages) == 0:
|
||||||
return 0, '', ''
|
return 0, '', ''
|
||||||
command_arg = [x.name for x in packages]
|
command_arg = [x.name for x in packages]
|
||||||
with self.runner('state name sdk_root channel') as ctx:
|
|
||||||
rc, stdout, stderr = ctx.run(name=command_arg, state=state)
|
data = 'N' # Answer 'No' in case sdkmanager wants us to accept license
|
||||||
|
with self.runner('state name sdk_root channel', data=data) as ctx:
|
||||||
|
rc, stdout, stderr = ctx.run(name=command_arg, state=state, data=data)
|
||||||
|
|
||||||
|
data = stdout.split('\n')
|
||||||
|
|
||||||
|
for line in data:
|
||||||
|
if self._RE_ACCEPT_LICENSE.match(line):
|
||||||
|
raise SdkManagerException("Licenses for some packages were not accepted")
|
||||||
|
|
||||||
if rc != 0:
|
if rc != 0:
|
||||||
err = self._try_parse_stderr(stderr)
|
err = self._try_parse_stderr(stderr)
|
||||||
if err:
|
if err:
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue