From 4308a48717bd1b48e0e7863efae4db103363b57c Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Wed, 14 Apr 2021 22:16:48 +0200 Subject: [PATCH] apksigcopier: remove exclude_all_meta logic This option is unneeded and unused in fdroidserver, and confusing. https://github.com/obfusk/apksigcopier/pull/36 # Conflicts: # fdroidserver/apksigcopier.py # fdroidserver/common.py --- fdroidserver/apksigcopier.py | 11 ++--------- fdroidserver/common.py | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/fdroidserver/apksigcopier.py b/fdroidserver/apksigcopier.py index 215dc5d0..48b72ce1 100644 --- a/fdroidserver/apksigcopier.py +++ b/fdroidserver/apksigcopier.py @@ -73,7 +73,6 @@ DATETIMEZERO = (1980, 0, 0, 0, 0, 0) ZipData = namedtuple("ZipData", ("cd_offset", "eocd_offset", "cd_and_eocd")) -exclude_all_meta = False # exclude all metadata files in copy_apk() copy_extra_bytes = False # copy extra bytes after data in copy_apk() @@ -163,14 +162,8 @@ def is_meta(filename): def exclude_from_copying(filename): - """ - Returns whether to exclude a file during copy_apk(). - - Excludes filenames in COPY_EXCLUDE (i.e. MANIFEST.MF) by default; when - exclude_all_meta is set to True instead, excludes all metadata files as - matched by is_meta(). - """ - return is_meta(filename) if exclude_all_meta else filename in COPY_EXCLUDE + """fdroidserver always wants JAR Signature files to be excluded""" + return is_meta(filename) ################################################################################ diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 4c000078..3a57a26e 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -69,7 +69,7 @@ from fdroidserver.exception import FDroidException, VCSException, NoSubmodulesEx from .asynchronousfilereader import AsynchronousFileReader from . import apksigcopier -apksigcopier.exclude_all_meta = True # remove v1 signatures too + # The path to this fdroidserver distribution FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))