-#!/usr/bin/env python2
-# -*- coding: utf-8 -*-
+#!/usr/bin/env python3
#
# fdroid.py - part of the FDroid server tools
-# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
-# Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
+# Copyright (C) 2010-2015, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2013-2014 Daniel Marti <mvdan@mvdan.cc>
#
# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU Affero General Public License as published by
import sys
import logging
-from fdroidserver.common import FDroidException
+import fdroidserver.common
+import fdroidserver.metadata
+from argparse import ArgumentError
commands = {
"build": "Build a package from source",
"scanner": "Scan the source code of a package",
"stats": "Update the stats of the repo",
"server": "Interact with the repo HTTP server",
- }
+ "signindex": "Sign indexes created using update --nosign",
+}
def print_help():
- print "usage: fdroid [-h|--help] <command> [<args>]"
- print
- print "Valid commands are:"
+ print("usage: fdroid [-h|--help|--version] <command> [<args>]")
+ print("")
+ print("Valid commands are:")
for cmd, summary in commands.items():
- print " " + cmd + ' ' * (15 - len(cmd)) + summary
- print
+ print(" " + cmd + ' ' * (15 - len(cmd)) + summary)
+ print("")
def main():
if command in ('-h', '--help'):
print_help()
sys.exit(0)
+ elif command == '--version':
+ import os.path
+ output = 'no version info found!'
+ cmddir = os.path.realpath(os.path.dirname(__file__))
+ moduledir = os.path.realpath(os.path.dirname(fdroidserver.common.__file__) + '/..')
+ if cmddir == moduledir:
+ # running from git
+ os.chdir(cmddir)
+ if os.path.isdir('.git'):
+ import subprocess
+ try:
+ output = subprocess.check_output(['git', 'describe'],
+ stderr=subprocess.STDOUT,
+ universal_newlines=True)
+ except subprocess.CalledProcessError:
+ output = 'git commit ' + subprocess.check_output(['git', 'rev-parse', 'HEAD'],
+ universal_newlines=True)
+ elif os.path.exists('setup.py'):
+ import re
+ m = re.search(r'''.*[\s,\(]+version\s*=\s*["']([0-9a-z.]+)["'].*''',
+ open('setup.py').read(), flags=re.MULTILINE)
+ if m:
+ output = m.group(1) + '\n'
+ else:
+ from pkg_resources import get_distribution
+ output = get_distribution('fdroidserver').version + '\n'
+ print(output),
+ sys.exit(0)
else:
- print "Command '%s' not recognised.\n" % command
+ print("Command '%s' not recognised.\n" % command)
print_help()
sys.exit(1)
verbose = any(s in sys.argv for s in ['-v', '--verbose'])
quiet = any(s in sys.argv for s in ['-q', '--quiet'])
+ # Helpful to differentiate warnings from errors even when on quiet
+ logformat = '%(levelname)s: %(message)s'
+ loglevel = logging.INFO
if verbose:
- logging.basicConfig(format='%(levelname)s: %(message)s', level=logging.DEBUG)
+ loglevel = logging.DEBUG
elif quiet:
- logging.basicConfig(format='%(message)s', level=logging.WARN)
- else:
- logging.basicConfig(format='%(message)s', level=logging.INFO)
+ loglevel = logging.WARN
+
+ logging.basicConfig(format=logformat, level=loglevel)
if verbose and quiet:
logging.critical("Specifying --verbose and --quiet and the same time is silly")
try:
mod.main()
# These are ours, contain a proper message and are "expected"
- except FDroidException, e:
+ except (fdroidserver.common.FDroidException,
+ fdroidserver.metadata.MetaDataException) as e:
if verbose:
raise
else:
logging.critical(str(e))
sys.exit(1)
+ except ArgumentError as e:
+ logging.critical(str(e))
+ sys.exit(1)
except KeyboardInterrupt:
print('')
sys.exit(1)
# These should only be unexpected crashes due to bugs in the code
# str(e) often doesn't contain a reason, so just show the backtrace
- except Exception, e:
+ except Exception as e:
logging.critical("Unknown exception found!")
raise
sys.exit(0)