diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 5645df23..1b41f111 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -45,6 +45,8 @@ def read_config(opts): sys.exit(2) options = opts + if not hasattr(options, 'verbose'): + options.verbose = False config = { 'build_server_always': False, diff --git a/fdroidserver/import.py b/fdroidserver/import.py index 2c1ff651..402a44f4 100644 --- a/fdroidserver/import.py +++ b/fdroidserver/import.py @@ -227,13 +227,12 @@ def main(): else: root_dir = src_dir - # Check AndroidManiifest.xml exists... - if not os.path.exists(root_dir + '/AndroidManifest.xml'): - print "AndroidManifest.xml did not exist in the expected location. Specify --subdir?" - sys.exit(1) - # Extract some information... paths = common.manifest_paths(root_dir, None) + if not paths: + print "No android project could be found. Specify --subdir?" + sys.exit(1) + version, vercode, package = common.parse_androidmanifests(paths) if not package: print "Couldn't find package ID"