From 2bf04f8054f796bb1a5b58bdca4c6bce58d87e4d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Daniel=20Mart=C3=AD?= Date: Tue, 15 Sep 2015 14:06:31 -0700 Subject: [PATCH] import: fix import -u from fdroiddata Have -u take precedence over .git checking to fix import -u being run from fdroiddata. --- fdroidserver/import.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fdroidserver/import.py b/fdroidserver/import.py index c215942b..ce19bd54 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -180,12 +180,12 @@ def main(): root_dir = None src_dir = None - if os.path.isdir('.git'): + if options.url: + root_dir, src_dir = get_metadata_from_url(app, options.url) + elif os.path.isdir('.git'): if options.url: app['Web Site'] = options.url root_dir = get_subdir(os.getcwd()) - elif options.url: - root_dir, src_dir = get_metadata_from_url(app, options.url) else: logging.error("Specify project url.") sys.exit(1) -- 2.30.2