diff options
| author | Chris Johns <chrisj@rtems.org> | 2016-03-16 17:14:45 +1100 |
|---|---|---|
| committer | Chris Johns <chrisj@rtems.org> | 2016-03-16 17:14:45 +1100 |
| commit | ed86b4b0063dabc2f680e3f56b6ff661ec2e51fe (patch) | |
| tree | d967b63a2772900ceeeac56cd41de0081802a6de /source-builder | |
| parent | sb: Do not expand the package name in a bset file. (diff) | |
| download | rtems-source-builder-ed86b4b0063dabc2f680e3f56b6ff661ec2e51fe.tar.bz2 | |
bare/devel/qemu: Fix the release URL logic and pkconfig python3 issues.
Closes #2645.
Diffstat (limited to 'source-builder')
| -rwxr-xr-x | source-builder/pkg-config | 5 | ||||
| -rw-r--r-- | source-builder/sb/download.py | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/source-builder/pkg-config b/source-builder/pkg-config index d2afff0..a5dfba0 100755 --- a/source-builder/pkg-config +++ b/source-builder/pkg-config @@ -87,8 +87,9 @@ def log(s, lf = True): print(s, file = out) else: if out != sys.stdout and trace_stdout: - print(s, end = '', flush = True) - print(out, s, end = '', flush = True) + print(s, end = '') + sys.stdout.flush() + print(s, end = '', file = out) def run(argv): diff --git a/source-builder/sb/download.py b/source-builder/sb/download.py index 355cd4a..bd6e6a6 100644 --- a/source-builder/sb/download.py +++ b/source-builder/sb/download.py @@ -561,9 +561,13 @@ def get_file(url, local, opts, config): # override the released check. # url_bases = opts.urls() - rtems_release_url_value = config.macros.expand('%{rtems_release_url}/%{rsb_version}/sources') + try: + rtems_release_url_value = config.macros.expand('%{rtems_release_url}/%{rsb_version}/sources') + except: + rtems_release_url_value = None + log.output('RTEMS release URL could not be expanded') rtems_release_url = None - if version.released(): + if version.released() and rtems_release_url_value: rtems_release_url = rtems_release_url_value with_rel_url = opts.with_arg('release-url') if with_rel_url[1] == 'not-found': @@ -571,6 +575,8 @@ def get_file(url, local, opts, config): with_rel_url = ('without_release-url', 'yes') if with_rel_url[0] == 'with_release-url': if with_rel_url[1] == 'yes': + if rtems_release_url_value is None: + raise error.general('no valid release URL') rtems_release_url = rtems_release_url_value elif with_rel_url[1] == 'no': pass |