mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-10-09 02:41:06 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

rename 'sdkversion' var to 'minSdkVersion' to avoid confusion

Browse source 
'sdkversion' is confusing when there is also 'targetSdkVersion' and
'maxSdkVersion'.
This commit is contained in:
Hans-Christoph Steiner 2016-06-06 20:13:57 +02:00
parent 0ae257db15
commit 1feccf9eb8
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fdroidserver/update.py
View file

@ -523,7 +523,7 @@ def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False):
logging.error(line.replace('sdkVersion:', '') logging.error(line.replace('sdkVersion:', '')
+ ' is not a valid minSdkVersion!') + ' is not a valid minSdkVersion!')
else: else:
apk['sdkversion'] = m.group(1) apk['minSdkVersion'] = m.group(1)
elif line.startswith("maxSdkVersion:"): elif line.startswith("maxSdkVersion:"):
apk['maxSdkVersion'] = re.match(sdkversion_pat, line).group(1) apk['maxSdkVersion'] = re.match(sdkversion_pat, line).group(1)
elif line.startswith("native-code:"): elif line.startswith("native-code:"):
@ -545,9 +545,9 @@ def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False):
perm = perm[16:] perm = perm[16:]
apk['features'].add(perm) apk['features'].add(perm)
if 'sdkversion' not in apk: if 'minSdkVersion' not in apk:
logging.warn("No SDK version information found in {0}".format(apkfile)) logging.warn("No SDK version information found in {0}".format(apkfile))
apk['sdkversion'] = 0 apk['minSdkVersion'] = 0
# Check for debuggable apks... # Check for debuggable apks...
if common.isApkDebuggable(apkfile, config): if common.isApkDebuggable(apkfile, config):
@ -936,7 +936,7 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
apkel.appendChild(hashel) apkel.appendChild(hashel)
addElement('sig', apk['sig'], doc, apkel) addElement('sig', apk['sig'], doc, apkel)
addElement('size', str(apk['size']), doc, apkel) addElement('size', str(apk['size']), doc, apkel)
addElement('sdkver', str(apk['sdkversion']), doc, apkel) addElement('sdkver', str(apk['minSdkVersion']), doc, apkel)
if 'maxSdkVersion' in apk: if 'maxSdkVersion' in apk:
addElement('maxsdkver', str(apk['maxSdkVersion']), doc, apkel) addElement('maxsdkver', str(apk['maxSdkVersion']), doc, apkel)
if 'added' in apk: if 'added' in apk: