From: Hans-Christoph Steiner Date: Tue, 4 Aug 2015 14:09:44 +0000 (+0200) Subject: build: check that metadata is present before creating tmp dirs X-Git-Tag: 0.6.0~11^2~2 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=8489047bcfecd332bd10044269c8ab90a284da89;p=fdroidserver.git build: check that metadata is present before creating tmp dirs Before, `fdroid build` would create some subdirs, then fail when it could not read the metadata via metadata.read_metadata(). This checks before whether there is any metadata available, and warns the user accordingly. --- diff --git a/fdroidserver/build.py b/fdroidserver/build.py index 021e1041..12cc61c1 100644 --- a/fdroidserver/build.py +++ b/fdroidserver/build.py @@ -1001,6 +1001,15 @@ def main(): global options, config options, parser = parse_commandline() + + metadata_files = glob.glob('.fdroid.*[a-z]') # ignore files ending in ~ + if 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")