From: Hans-Christoph Steiner <hans@eds.org>
Date: Mon, 4 Dec 2017 20:22:16 +0000 (+0100)
Subject: common: aapt 24.0.0 (v0.2-2964546) is now required
X-Git-Tag: 1.0.0~43^2~8
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=a2978a5526411d18872e3efab06d409008be4b78;p=fdroidserver.git

common: aapt 24.0.0 (v0.2-2964546) is now required

Without a recent aapt, the <uses-permission-sdk-23> tag will not be found.
---

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 6e022f47..6511181f 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -388,8 +388,14 @@ def test_aapt_version(aapt):
             minor = m.group(2)
             bugfix = m.group(3)
             # the Debian package has the version string like "v0.2-23.0.2"
-            if '.' not in bugfix and LooseVersion('.'.join((major, minor, bugfix))) < LooseVersion('0.2.2166767'):
-                logging.warning(_("'{aapt}' is too old, fdroid requires build-tools-23.0.0 or newer!")
+            too_old = False
+            if '.' in bugfix:
+                if LooseVersion(bugfix) < LooseVersion('24.0.0'):
+                    too_old = True
+            elif LooseVersion('.'.join((major, minor, bugfix))) < LooseVersion('0.2.2964546'):
+                too_old = True
+            if too_old:
+                logging.warning(_("'{aapt}' is too old, fdroid requires build-tools-24.0.0 or newer!")
                                 .format(aapt=aapt))
         else:
             logging.warning(_('Unknown version of aapt, might cause problems: ') + output)