From 5d705452f581b851bcc2f8aa3e8cdc7d50b61de7 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Mon, 15 May 2017 19:47:31 +0200 Subject: [PATCH] update: allow repo files to use _ in the file names _ is a valid character for Java package names, so it should also work in the repo file naming scheme. This makes it so it only splits the file name based on the last _. --- fdroidserver/update.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 1cb2fc4e..41d0bd14 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -849,12 +849,13 @@ def scan_repo_files(apkcache, repodir, knownapks, use_date_from_file=False): repo_file['versionName'] = shasum # the static ID is the SHA256 unless it is set in the metadata repo_file['packageName'] = shasum - n = name_utf8.split('_') + + n = name_utf8.rsplit('_', maxsplit=1) if len(n) == 2: packageName = n[0] versionCode = n[1].split('.')[0] if re.match('^-?[0-9]+$', versionCode) \ - and common.is_valid_package_name(name_utf8.split('_')[0]): + and common.is_valid_package_name(n[0]): repo_file['packageName'] = packageName repo_file['versionCode'] = int(versionCode) srcfilename = name + b'_src.tar.gz' -- 2.30.2