Fix ABS >= 4.3.0

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 7d54471f98ff11e4aa3f7d6095002ee8af6deecc..57671a64c530cb64e1e291344433733c94ba38f3 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -920,6 +920,9 @@ def getsrclib(spec, extlib_dir, sdk_path, basepath=False):
             'https://github.com/JakeWharton/ActionBarSherlock.git', sdir, sdk_path)
         vcs.gotorevision(ref)
         libdir = os.path.join(sdir, 'library')
+        # For latest ABS releases
+        if not os.path.exists(libdir):
+            libdir = os.path.join(sdir, 'actionbarsherlock')
         if subprocess.call([os.path.join(sdk_path, 'tools', 'android'),
             'update', 'project', '-p',
             libdir]) != 0: