This is an automated email from the ASF dual-hosted git repository.
ibzib pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/beam.git
The following commit(s) were added to refs/heads/master by this push:
new 5ae1057 [BEAM-10234] Fix error message for missing licenses.
new f5b505a Merge pull request #11983 from ibzib/BEAM-10234
5ae1057 is described below
commit 5ae10578940fd2f83ecf64207b41d3e56404551e
Author: Kyle Weaver <[email protected]>
AuthorDate: Wed Jun 10 17:20:00 2020 -0700
[BEAM-10234] Fix error message for missing licenses.
---
sdks/python/container/license_scripts/pull_licenses_py.py | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/sdks/python/container/license_scripts/pull_licenses_py.py
b/sdks/python/container/license_scripts/pull_licenses_py.py
index ae33129..e85ff70 100644
--- a/sdks/python/container/license_scripts/pull_licenses_py.py
+++ b/sdks/python/container/license_scripts/pull_licenses_py.py
@@ -115,6 +115,7 @@ def pull_from_url(dep, configs):
finally:
shutil.rmtree(cur_temp_dir)
+
if __name__ == "__main__":
os.makedirs(LICENSE_DIR)
no_licenses = []
@@ -144,8 +145,12 @@ if __name__ == "__main__":
'and add entries to sdks/python/container/license_scripts/' \
'dep_urls_py.yaml.'
raise RuntimeError(
- 'Could not retrieve licences for packages [{license_list}] in '
+ 'Could not retrieve licences for packages {license_list} in '
'Python{py_ver} environment. \n {how_to}'.format(
- py_ver=py_ver, license_list=sorted(','.join(no_licenses)),
how_to=how_to))
+ py_ver=py_ver,
+ license_list=sorted(no_licenses),
+ how_to=how_to))
else:
- logging.info('Successfully pulled licenses for {n}
dependencies'.format(n=len(dependencies)))
+ logging.info(
+ 'Successfully pulled licenses for {n} dependencies'.format(
+ n=len(dependencies)))
