From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 23 Feb 2016 12:03:26 +0000 (+0000)
Subject: build: don't error on .fdroid* files in fdroiddata
X-Git-Tag: 0.7.0~102
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=3e124c81054bd720cf1350abf37e1bc6ac194b08;p=fdroidserver.git

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

This avoids the following incorrect error:

	fdroidserver.common.FDroidException: Only one local metadata file allowed! Found: .fdroid.keystorepass.txt .fdroid.keypass.txt
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index 2add23a7..216de06f 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -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")