From 63d7cbee9f8c1de3fef9ce2dd357f48aa6504a69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Mon, 17 Feb 2014 12:58:28 +0100 Subject: [PATCH] Fix a buildjni regression --- fdroidserver/build.py | 2 +- fdroidserver/import.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 7ed210dc..5f60e0f1 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -457,7 +457,7 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, srclib_dir, extlib_d (app['id'], thisbuild['version']), p.stdout) # Build native stuff if required... - if thisbuild.get('buildjni') not in (None, 'no'): + if thisbuild.get('buildjni') not in (None, ['no']): logging.info("Building native libraries...") jni_components = thisbuild.get('buildjni') if jni_components == ['yes']: diff --git a/fdroidserver/import.py b/fdroidserver/import.py index 6d0e8ef3..afc403f5 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -286,7 +286,7 @@ def main(): if options.subdir: build['subdir'] = options.subdir if os.path.exists(os.path.join(root_dir, 'jni')): - build['buildjni'] = 'yes' + build['buildjni'] = ['yes'] app['builds'].append(build) # Keep the repo directory to save bandwidth... -- 2.30.2