diff --git a/build-relocatable-install.py b/build-relocatable-install.py index 7e33e3bfd047f14d2835dca3734ee55d8543fe63..e74b7e80c2afeb2a9fb27dd15b89e3f0eba9fcf4 100755 --- a/build-relocatable-install.py +++ b/build-relocatable-install.py @@ -351,7 +351,8 @@ def main(): installed_binaries = set() # type: typing.Set[str] for package, source in ( - list(DEPENDENCIES.items()) + list(PRIMARY_ARCH_DEPENDENCIES.items()) + list(DEPENDENCIES.items()) + + list(PRIMARY_ARCH_DEPENDENCIES.items()) ): if os.path.exists('/usr/share/doc/{}/copyright'.format(package)): installed_binaries.add(package) @@ -373,7 +374,8 @@ def main(): package, ], universal_newlines=True).splitlines() ): - source_to_download.add(re.sub(r'[+]srt[0-9a-z.]+$', '', expr)) + source_to_download.add( + re.sub(r'[+]srt[0-9a-z.]+$', '', expr)) else: install( '{}/build-relocatable/usr/share/doc/{}/copyright'.format( @@ -398,7 +400,8 @@ def main(): 'dpkg-query', '-W', '-f', - r'${binary:Package}\t${Version}\t${Source}\t${Installed-Size}\n', + (r'${binary:Package}\t${Version}\t' + r'${Source}\t${Installed-Size}\n'), ] + sorted(installed_binaries), stdout=writer) with open( diff --git a/pressure-vessel-test-ui b/pressure-vessel-test-ui index cc638f19f5a82e5ed87cc41265da90c43d93d922..30340030c7cd30fdfb0cb4555a930e361c150956 100755 --- a/pressure-vessel-test-ui +++ b/pressure-vessel-test-ui @@ -64,7 +64,6 @@ class Gui: os.path.join(source_of_runtimes, member) ) files = os.path.join(path, 'files') - metadata = os.path.join(path, 'metadata') if os.path.isdir(files): description = self._describe_runtime(path) @@ -180,6 +179,7 @@ class Gui: except GLib.Error: pass else: + assert name is not None variant = name.split('.')[-1] except GLib.Error: pass diff --git a/tests/relocatable-install.py b/tests/relocatable-install.py index edaaba0282ba45cadc7ed666720019b932845df0..9875842bcd038fcb4c20c6dba2b551c7f45728b5 100755 --- a/tests/relocatable-install.py +++ b/tests/relocatable-install.py @@ -23,7 +23,6 @@ # SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. import argparse -import json import os import subprocess import sys