kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-16 03:10:09 +02:00
Code Activity

apksigcopier: remove exclude_all_meta logic

Browse Source 
This option is unneeded and unused in fdroidserver, and confusing.

https://github.com/obfusk/apksigcopier/pull/36

# Conflicts:
#	fdroidserver/apksigcopier.py
#	fdroidserver/common.py
This commit is contained in:
Hans-Christoph Steiner 2021-04-14 22:16:48 +02:00
parent f5792d4f49
commit 4308a48717
2 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fdroidserver/apksigcopier.py
View File

@ -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)
################################################################################

2
fdroidserver/common.py
View File

@ -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__), '..'))