From 5150c721f4500a52bc7d27e6344e5936bffffd24 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 12 Mar 2025 17:03:13 +0100 Subject: [PATCH] verify_apk_signature: work when options is not set Then test_signatures.py can run on the PUBLISH CI job. --- .gitlab-ci.yml | 1 + fdroidserver/common.py | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 2e48c0bb..42833779 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -739,6 +739,7 @@ PUBLISH: tests/test_gpgsign.py tests/test_metadata.py tests/test_publish.py + tests/test_signatures.py tests/test_signindex.py - cd tests diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 96b75944..f473efd7 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -3894,11 +3894,11 @@ def verify_apk_signature(apk, min_sdk_version=None): args = [config['apksigner'], 'verify'] if min_sdk_version: args += ['--min-sdk-version=' + min_sdk_version] - if options.verbose: + if options and options.verbose: args += ['--verbose'] try: output = subprocess.check_output(args + [apk]) - if options.verbose: + if options and options.verbose: logging.debug(apk + ': ' + output.decode('utf-8')) return True except subprocess.CalledProcessError as e: