chiark / gitweb /
rename maxSdkVersion variables to match Android
authorHans-Christoph Steiner <hans@eds.org>
Mon, 6 Jun 2016 18:09:15 +0000 (20:09 +0200)
committerHans-Christoph Steiner <hans@eds.org>
Tue, 14 Jun 2016 08:06:02 +0000 (10:06 +0200)
Since this variable is already different than the XML name ('maxsdkver'),
this eliminates one more name for the same thing.

fdroidserver/update.py

index ba7a3998c2fb763143970d0a3477b9ae9f8c0c93..fa1820891b443a535d059a44602b5ffe50aed24d 100644 (file)
@@ -525,7 +525,7 @@ def scan_apks(apps, apkcache, repodir, knownapks, use_date_from_apk=False):
                     else:
                         apk['sdkversion'] = m.group(1)
                 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:"):
                     apk['nativecode'] = []
                     for arch in line[13:].split(' '):
@@ -937,8 +937,8 @@ def make_index(apps, sortedids, apks, repodir, archive, categories):
             addElement('sig', apk['sig'], doc, apkel)
             addElement('size', str(apk['size']), doc, apkel)
             addElement('sdkver', str(apk['sdkversion']), doc, apkel)
-            if 'maxsdkversion' in apk:
-                addElement('maxsdkver', str(apk['maxsdkversion']), doc, apkel)
+            if 'maxSdkVersion' in apk:
+                addElement('maxsdkver', str(apk['maxSdkVersion']), doc, apkel)
             if 'added' in apk:
                 addElement('added', time.strftime('%Y-%m-%d', apk['added']), doc, apkel)
             addElementNonEmpty('permissions', ','.join(apk['permissions']), doc, apkel)