mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

import: fix import -u from fdroiddata

Browse source 
Have -u take precedence over .git checking to fix import -u being run from
fdroiddata.
This commit is contained in:
Daniel Martí 2015-09-15 14:06:31 -07:00
parent 41370a12b0
commit 2bf04f8054
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
fdroidserver/import.py
View file

@ -180,12 +180,12 @@ def main():
root_dir = None root_dir = None
src_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: if options.url:
app['Web Site'] = options.url app['Web Site'] = options.url
root_dir = get_subdir(os.getcwd()) root_dir = get_subdir(os.getcwd())
elif options.url:
root_dir, src_dir = get_metadata_from_url(app, options.url)
else: else:
logging.error("Specify project url.") logging.error("Specify project url.")
sys.exit(1) sys.exit(1)