mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-14 06:52:39 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
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")) 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() 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): def exclude_from_copying(filename):
""" """fdroidserver always wants JAR Signature files to be excluded"""
Returns whether to exclude a file during copy_apk(). return is_meta(filename)
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
################################################################################ ################################################################################

2
fdroidserver/common.py
View file

@ -69,7 +69,7 @@ from fdroidserver.exception import FDroidException, VCSException, NoSubmodulesEx
from .asynchronousfilereader import AsynchronousFileReader from .asynchronousfilereader import AsynchronousFileReader
from . import apksigcopier from . import apksigcopier
apksigcopier.exclude_all_meta = True # remove v1 signatures too
# The path to this fdroidserver distribution # The path to this fdroidserver distribution
FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..')) FDROID_PATH = os.path.realpath(os.path.join(os.path.dirname(__file__), '..'))