From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 15 Sep 2015 21:06:31 +0000 (-0700)
Subject: import: fix import -u from fdroiddata
X-Git-Tag: 0.5.0~92
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2bf04f8054f796bb1a5b58bdca4c6bce58d87e4d;p=fdroidserver.git

import: fix import -u from fdroiddata

Have -u take precedence over .git checking to fix import -u being run from
fdroiddata.
---

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)