From a3e082ab7fa36a08a6caf4ce16fc6d81b18a4e36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 17 Jun 2013 18:15:11 +0200 Subject: [PATCH 1/4] Create comma-separated lists in the Python way --- fdroidserver/update.py | 17 ++++------------- 1 file changed, 4 insertions(+), 13 deletions(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index ee25daf6..ce1934fe 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -528,19 +528,10 @@ def make_index(apps, apks, repodir, archive, categories): if 'added' in apk: addElement('added', time.strftime('%Y-%m-%d', apk['added']), doc, apkel) perms = "" - for p in apk['permissions']: - if len(perms) > 0: - perms += "," - perms += p - if len(perms) > 0: - addElement('permissions', perms, doc, apkel) - features = "" - for f in apk['features']: - if len(features) > 0: - features += "," - features += f - if len(features) > 0: - addElement('features', features, doc, apkel) + if len(apk['permissions']) > 0: + addElement('permissions', ','.join(apk['permissions']), doc, apkel) + if len(apk['features') > 0: + addElement('features', ','.join(apk['features']), doc, apkel) of = open(os.path.join(repodir, 'index.xml'), 'wb') if options.pretty: From 2f5da8ed91da2eb179dc6dac336680c80a9cc27f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 17 Jun 2013 18:15:52 +0200 Subject: [PATCH 2/4] Create a list of native code archs --- fdroidserver/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index ce1934fe..2d6c5845 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -291,7 +291,7 @@ def scan_apks(apps, apkcache, repodir, knownapks): elif line.startswith("sdkVersion:"): thisinfo['sdkversion'] = re.match(sdkversion_pat, line).group(1) elif line.startswith("native-code:"): - thisinfo['nativecode'] = re.match(string_pat, line).group(1) + thisinfo['nativecode'] = line[14:-1].split("' '") elif line.startswith("uses-permission:"): perm = re.match(string_pat, line).group(1) if perm.startswith("android.permission."): From d3ac6899ff45fe7d733f3785ff2299682bdbcc96 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 17 Jun 2013 18:20:29 +0200 Subject: [PATCH 3/4] Add 'nativecode' field to apks which use it --- fdroidserver/update.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 2d6c5845..9f06e672 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -530,6 +530,8 @@ def make_index(apps, apks, repodir, archive, categories): perms = "" if len(apk['permissions']) > 0: addElement('permissions', ','.join(apk['permissions']), doc, apkel) + if len(apk['nativecode']) > 0: + addElement('nativecode', ','.join(apk['nativecode']), doc, apkel) if len(apk['features') > 0: addElement('features', ','.join(apk['features']), doc, apkel) From 5cdd34606e469254abd3b638c4eb64b59c0cc0c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Mon, 17 Jun 2013 18:29:29 +0200 Subject: [PATCH 4/4] Correct typo --- fdroidserver/update.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 9f06e672..e8aa3440 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -532,7 +532,7 @@ def make_index(apps, apks, repodir, archive, categories): addElement('permissions', ','.join(apk['permissions']), doc, apkel) if len(apk['nativecode']) > 0: addElement('nativecode', ','.join(apk['nativecode']), doc, apkel) - if len(apk['features') > 0: + if len(apk['features']) > 0: addElement('features', ','.join(apk['features']), doc, apkel) of = open(os.path.join(repodir, 'index.xml'), 'wb')