From e3d319f30b8f53549c1d1449572d7f44e8bb216b Mon Sep 17 00:00:00 2001 From: Jochen Sprickerhof Date: Fri, 13 Jan 2023 18:00:29 +0100 Subject: [PATCH] Update with suggestions --- fdroidserver/common.py | 4 ++-- fdroidserver/update.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index cfe60150..d52e61fd 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -102,7 +102,7 @@ STRICT_APPLICATION_ID_REGEX = re.compile(r'''(?:^[a-zA-Z]+(?:\d*[a-zA-Z_]*)*)(?: VALID_APPLICATION_ID_REGEX = re.compile(r'''(?:^[a-z_]+(?:\d*[a-zA-Z_]*)*)(?:\.[a-z_]+(?:\d*[a-zA-Z_]*)*)*$''', re.IGNORECASE) ANDROID_PLUGIN_REGEX = re.compile(r'''\s*(:?apply plugin:|id)\(?\s*['"](android|com\.android\.application)['"]\s*\)?''') -APPLE_BUNDLEiDENTIFIER_REGEX = re.compile(r'''^[a-zA-Z-.]*''') +APPLE_BUNDLEIDENTIFIER_REGEX = re.compile(r'''^[a-zA-Z-.]*''') SETTINGS_GRADLE_REGEX = re.compile(r'settings\.gradle(?:\.kts)?') GRADLE_SUBPROJECT_REGEX = re.compile(r'''['"]:?([^'"]+)['"]''') @@ -2016,7 +2016,7 @@ def is_valid_package_name(name): """ return VALID_APPLICATION_ID_REGEX.match(name) is not None \ - or APPLE_BUNDLEiDENTIFIER_REGEX.match(name) is not None \ + or APPLE_BUNDLEIDENTIFIER_REGEX.match(name) is not None \ or FDROID_PACKAGE_NAME_REGEX.match(name) is not None diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 30f2f5ea..307fd5ec 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -528,7 +528,7 @@ def insert_obbs(repodir, apps, apks): def version_string_to_int(version): """Approximately convert a [Major].[Minor].[Patch] version string consisting of numeric characters (0-9) and periods to a number. The - exponents are chosen such that it still fits in the 64bit index.yaml range. + exponents are chosen such that it still fits in the 64bit JSON/Android range. """ version = version.split('.') major = int(version.pop(0)) if version else 0