kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-16 03:10:09 +02:00
Code Activity

build: don't error on .fdroid* files in fdroiddata

Browse Source 
This avoids the following incorrect error:

	fdroidserver.common.FDroidException: Only one local metadata file allowed! Found: .fdroid.keystorepass.txt .fdroid.keypass.txt
This commit is contained in:
Daniel Martí 2016-02-23 12:03:26 +00:00
parent 2e5c96dcfa
commit 3e124c8105
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fdroidserver/build.py
View File

@ -1009,13 +1009,14 @@ def main():
options, parser = parse_commandline()
metadata_files = glob.glob('.fdroid.*[a-z]') # ignore files ending in ~
if len(metadata_files) > 1:
if os.path.isdir('metadata'):
pass
elif len(metadata_files) == 0:
raise FDroidException("No app metadata found, nothing to process!")
elif len(metadata_files) > 1:
raise FDroidException("Only one local metadata file allowed! Found: "
+ " ".join(metadata_files))
if not os.path.isdir('metadata') and len(metadata_files) == 0:
raise FDroidException("No app metadata found, nothing to process!")
if not options.appid and not options.all:
parser.error("option %s: If you really want to build all the apps, use --all" % "all")