From: Daniel Martí Date: Mon, 4 Nov 2013 17:37:57 +0000 (+0100) Subject: Don't check for dirs and files in the main script X-Git-Tag: 0.1~225 X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=429221f282930cfeb99a0bebe4e09c7c21edbb34;p=fdroidserver.git Don't check for dirs and files in the main script --- diff --git a/fdroid b/fdroid index 94e3aafc..a1f124c5 100755 --- a/fdroid +++ b/fdroid @@ -52,14 +52,6 @@ def main(): print_help() sys.exit(1) - if command != 'init' and not os.path.isfile('config.py'): - print "Missing config file - is this a repo directory?" - sys.exit(2) - - for basedir in ('metadata', 'tmp'): - if not os.path.exists(basedir): - os.makedirs(basedir) - # Trick optparse into displaying the right usage when --help is used. sys.argv[0] += ' ' + command diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 9ba3dd3e..77ed1995 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -867,6 +867,9 @@ def write_metadata(dest, app): # returned by the parse_metadata function. def read_metadata(xref=True, package=None): apps = [] + for basedir in ('metadata', 'tmp'): + if not os.path.exists(basedir): + os.makedirs(basedir) for metafile in sorted(glob.glob(os.path.join('metadata', '*.txt'))): if package is None or metafile == os.path.join('metadata', package + '.txt'): try: