diff options
| author | Nicky <nicky.dasmijn@gmail.com> | 2022-04-07 02:35:47 +0200 |
|---|---|---|
| committer | Nicky <nicky.dasmijn@gmail.com> | 2022-04-07 02:35:47 +0200 |
| commit | cca7e12e1bacb4ab116ca25d2a33e18d095c8d09 (patch) | |
| tree | 547ad9d11c8e3cb59c8e2af8f24624b4624fbb40 /scripts | |
| parent | 603ad5a4f2450f67d2d253f199b3f6a216b30248 (diff) | |
Bring packages formater step on par with 3p installation:
- When installing a 3P via use_prebuilt_binary it will pass --installdir=${AUTOBUILD_INSTALL_DIR} to
autobuild. On the other hand packages-formater was not passing this option, this could lead to subtle
errors when AUTOBUILD_INSTALL_DIR is different to what autobuild.xml stipulates.
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/packages-formatter.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/scripts/packages-formatter.py b/scripts/packages-formatter.py index ff7c892577..4449111e46 100755 --- a/scripts/packages-formatter.py +++ b/scripts/packages-formatter.py @@ -34,6 +34,7 @@ import argparse parser = argparse.ArgumentParser(description='Format dependency version and copyright information for the viewer About box content') parser.add_argument('channel', help='viewer channel name') parser.add_argument('version', help='viewer version number') +parser.add_argument('install_dir', help="install dir of packages") args = parser.parse_args() _autobuild=os.getenv('AUTOBUILD', 'autobuild') @@ -74,8 +75,8 @@ def add_info(key, pkg, lines): else: dups[key].add(pkg) -versions=autobuild('install', '--versions') -copyrights=autobuild('install', '--copyrights') +versions=autobuild('install', '--versions', '--install-dir', args.install_dir) +copyrights=autobuild('install', '--copyrights', '--install-dir', args.install_dir) viewer_copyright = copyrights.readline() # first line is the copyright for the viewer itself # Two different autobuild outputs, but we treat them essentially the same way: |