Skip to content
GitLab

Still aapt output parsing, adapting regex in updated.py to fix 'fdroid update' for build-tools 28.0.3

Merged Francesco Cervigni requested to merge neonsoftware/fdroidserver:master into master

update.py: Still aapt output parsing, setting regex for catching 'name=' to catch only first occurrence in aapt output for build-tools 28.0.3

As mentioned in other issues, build-tools 28.0.3 added a new field in the end 'compileSdkVersionCodename=', which also accidentally ends with the string 'name='. (see sample output below) The purpose of this regex was to catch the 'packageName' field, which is now the first occurence of 'name=', therefore added with non-greedy symbol.

sample aapt output (28.0.3): package: name='com.a.b.app' versionCode='1' versionName='1.0' compileSdkVersion='28' compileSdkVersionCodename='9'

previously, regex was catching second occurence, so '9', then fdroid update fails.

live regex: before after

See merge request !582 (merged) and !582 (merged)

Edited by Hans-Christoph Steiner