opensourcemirror
/
fdroid-server
mirror of https://gitlab.com/fdroid/fdroidserver.git
1
0
Fork 0
Code Issues Releases Wiki Activity

remove last `maven:` quirks and make it always a string 

It turns out that the maven: field was originally declared as a TYPE_STRING,
given that it was not given a different type in metadata.py's 	flagtypes.
The code was confused because it was given a default value of `False` rather
than `None` as the rest of the TYPE_STRING fields have.

This construct in build.py means maven: should always be a string:

        if '@' in build.maven:
            maven_dir = os.path.join(root_dir, build.maven.split('@', 1)[1])
        else:
            maven_dir = root_dir
This commit is contained in:
Hans-Christoph Steiner 2023-04-20 10:09:11 +02:00
parent a107e810d4
commit ad960c6ecd
No known key found for this signature in database
GPG Key ID: 3E177817BA1B9BFA
7 changed files with 120 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -58,6 +58,7 @@ metadata_v0:
- ../tests/dump_internal_metadata_format.py
- sed -i
-e "/buildozer/d"
-e 's,maven\(\W\) false,maven\1 null,'
metadata/dump_*/*.yaml
- diff -uw metadata/dump_*

11
CHANGELOG.md
View File

@ -4,6 +4,17 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
## unreleased
### Added
### Fixed
### Removed
* The `maven:` field is now always a string, with `yes` as a legacy special
value. It is no longer treated like a boolean in any case.
## [2.2.1] - 2023-03-09
### Added

10
fdroidserver/metadata.py
View File

@ -265,7 +265,7 @@ class Build(dict):
self.init = ''
self.patch = []
self.gradle = []
self.maven = False
self.maven = None
self.output = None
self.binary = None
self.srclibs = []
@ -641,10 +641,7 @@ def post_metadata_parse(app):
elif flagtype(k) is TYPE_INT:
build[k] = v
elif flagtype(k) is TYPE_STRING:
if k == 'maven':
build[k] = v
else:
build[k] = str(v)
build[k] = str(v)
builds.append(build)
app['Builds'] = sorted_builds(builds)
@ -898,9 +895,6 @@ def write_yaml(mf, app):
value = getattr(build, field)
if field == 'gradle' and value == ['off']:
value = [ruamel.yaml.scalarstring.SingleQuotedScalarString('off')]
if field in ('maven'):
if value == 'no':
continue
typ = flagtype(field)
# don't check value == True for TYPE_INT as it could be 0
if value is not None and (typ == TYPE_INT or value):

8
tests/metadata/dump/com.politedroid.yaml
View File

@ -27,7 +27,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -62,7 +62,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -97,7 +97,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -133,7 +133,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false

56
tests/metadata/dump/org.adaway.yaml
View File

@ -25,7 +25,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -61,7 +61,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -98,7 +98,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -135,7 +135,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -172,7 +172,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -209,7 +209,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -245,7 +245,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -281,7 +281,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -318,7 +318,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -355,7 +355,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -392,7 +392,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -429,7 +429,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -466,7 +466,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -504,7 +504,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -541,7 +541,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -579,7 +579,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -617,7 +617,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -655,7 +655,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -701,7 +701,7 @@ Builds:
init:
- rm android-libs/Donations/custom_rules.xml
- git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -751,7 +751,7 @@ Builds:
init:
- rm android-libs/Donations/custom_rules.xml
- git clone https://github.com/dschuermann/HtmlSpanner android-libs/HtmlSpanner
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -795,7 +795,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -833,7 +833,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -871,7 +871,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -909,7 +909,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -947,7 +947,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -985,7 +985,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1023,7 +1023,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1061,7 +1061,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false

16
tests/metadata/dump/org.smssecure.smssecure.yaml
View File

@ -25,7 +25,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -86,7 +86,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -129,7 +129,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -170,7 +170,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -211,7 +211,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -251,7 +251,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -291,7 +291,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -331,7 +331,7 @@ Builds:
- 'yes'
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false

132
tests/metadata/dump/org.videolan.vlc.yaml
View File

@ -28,7 +28,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -68,7 +68,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -108,7 +108,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -148,7 +148,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -185,7 +185,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -224,7 +224,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -263,7 +263,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -302,7 +302,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -341,7 +341,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -379,7 +379,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -417,7 +417,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -455,7 +455,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -493,7 +493,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -531,7 +531,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -569,7 +569,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -607,7 +607,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -645,7 +645,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -683,7 +683,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -721,7 +721,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -759,7 +759,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -797,7 +797,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -835,7 +835,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -873,7 +873,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -911,7 +911,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -949,7 +949,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -987,7 +987,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1025,7 +1025,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1063,7 +1063,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1101,7 +1101,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1139,7 +1139,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1177,7 +1177,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1215,7 +1215,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1253,7 +1253,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1291,7 +1291,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1329,7 +1329,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1367,7 +1367,7 @@ Builds:
gradle: []
gradleprops: []
init: ''
maven: false
maven: null
ndk: null
novcheck: false
oldsdkloc: false
@ -1406,7 +1406,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1446,7 +1446,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1486,7 +1486,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1526,7 +1526,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1566,7 +1566,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1606,7 +1606,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1646,7 +1646,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1686,7 +1686,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1726,7 +1726,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1766,7 +1766,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1806,7 +1806,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1846,7 +1846,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1886,7 +1886,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1926,7 +1926,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -1966,7 +1966,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2006,7 +2006,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2046,7 +2046,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2086,7 +2086,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2126,7 +2126,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2166,7 +2166,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2206,7 +2206,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2246,7 +2246,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2286,7 +2286,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2326,7 +2326,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2366,7 +2366,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2406,7 +2406,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2446,7 +2446,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2486,7 +2486,7 @@ Builds:
- VanillaARMv6fpu
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2526,7 +2526,7 @@ Builds:
- VanillaARMv7
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false
@ -2566,7 +2566,7 @@ Builds:
- VanillaX86
gradleprops: []
init: ''
maven: false
maven: null
ndk: r10d
novcheck: false
oldsdkloc: false