mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-04 06:30:27 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

standardize on versionName as spelling

Browse source
This commit is contained in:
Hans-Christoph Steiner 2025-08-27 16:50:33 +02:00
parent 1068057524
commit bbe29abaa3
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
fdroidserver/checkupdates.py
View file

@ -233,7 +233,7 @@ def check_tags(app: metadata.App, pattern: str) -> tuple[str, int, str]:
if verex: if verex:
m = re.search(verex, filecontent) m = re.search(verex, filecontent)
if not m: if not m:
logging.debug(f"UpdateCheckData regex {verex} for version name" logging.debug(f"UpdateCheckData regex {verex} for versionName"
f" has no match in tag {tag}") f" has no match in tag {tag}")
continue continue

8
fdroidserver/common.py
View file

@ -2211,7 +2211,7 @@ def parse_androidmanifests(paths, app):
version = matches version = matches
else: else:
# If build.gradle contains applicationNameSuffix add it to the end of version name # If build.gradle contains applicationNameSuffix add it to the end of versionName
matches = vnssearch_g(line) matches = vnssearch_g(line)
if matches and temp_version_name: if matches and temp_version_name:
name_suffix = matches.group(2) name_suffix = matches.group(2)
@ -2294,7 +2294,7 @@ def parse_androidmanifests(paths, app):
logging.debug("..got package={0}, version={1}, vercode={2}" logging.debug("..got package={0}, version={1}, vercode={2}"
.format(package, version, vercode)) .format(package, version, vercode))
# Always grab the package name and version name in case they are not # Always grab the package name and versionName in case they are not
# together with the highest versionCode # together with the highest versionCode
if max_package is None and package is not None: if max_package is None and package is not None:
max_package = package max_package = package
@ -2610,7 +2610,7 @@ def prepare_source(vcs, app, build, build_dir, srclib_dir, extlib_dir, onserver=
# Insert versionCode and number into the manifest if necessary # Insert versionCode and number into the manifest if necessary
if build.forceversion: if build.forceversion:
logging.info("Changing the version name") logging.info("Changing the versionName")
for path in manifest_paths(root_dir, flavors): for path in manifest_paths(root_dir, flavors):
if not os.path.isfile(path): if not os.path.isfile(path):
continue continue
@ -2950,7 +2950,7 @@ def get_apk_id(apkfile):
------- -------
appid appid
versionCode versionCode
version name versionName
""" """
try: try:

2
fdroidserver/import_subcommand.py
View file

@ -352,7 +352,7 @@ def main():
if not appid: if not appid:
raise FDroidException(_("Couldn't find Application ID")) raise FDroidException(_("Couldn't find Application ID"))
if not versionName: if not versionName:
logging.warning(_('Could not find latest version name')) logging.warning(_('Could not find latest versionName'))
if not versionCode: if not versionCode:
logging.warning(_('Could not find latest versionCode')) logging.warning(_('Could not find latest versionCode'))
else: else: