kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-14 02:50:12 +01:00
Code Activity

AM.xml is not the only file that designates an android app source dir

Browse Source
This commit is contained in:
Daniel Martí 2013-11-02 22:52:52 +01:00
parent 5b613292c3
commit 7a4ec5c083
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fdroidserver/common.py
View File

@ -45,6 +45,8 @@ def read_config(opts):
sys.exit(2) sys.exit(2)
options = opts options = opts
if not hasattr(options, 'verbose'):
options.verbose = False
config = { config = {
'build_server_always': False, 'build_server_always': False,

9
fdroidserver/import.py
View File

@ -227,13 +227,12 @@ def main():
else: else:
root_dir = src_dir 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... # Extract some information...
paths = common.manifest_paths(root_dir, None) 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) version, vercode, package = common.parse_androidmanifests(paths)
if not package: if not package:
print "Couldn't find package ID" print "Couldn't find package ID"