kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-08-15 19:00:11 +02:00
Code Activity

Use OptionError exceptions

Browse Source
This commit is contained in:
Daniel Martí 2013-12-22 21:39:39 +01:00
parent 0d766cef1c
commit 588277479b
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fdroidserver/build.py
View File

@ -28,7 +28,7 @@ import traceback
import time
import json
from ConfigParser import ConfigParser
from optparse import OptionParser
from optparse import OptionParser, OptionError
import common, metadata
from common import BuildException, VCSException, FDroidPopen
@ -820,8 +820,7 @@ def parse_commandline():
options.stop = True
if options.force and not options.test:
print "Force is only allowed in test mode"
sys.exit(1)
raise OptionError("Force is only allowed in test mode", "force")
return options, args
@ -834,16 +833,14 @@ def main():
options, args = parse_commandline()
if not args and not options.all:
print "If you really want to build all the apps, use --all"
sys.exit(1)
raise OptionError("If you really want to build all the apps, use --all", "all")
config = common.read_config(options)
if config['build_server_always']:
options.server = True
if options.resetserver and not options.server:
print "Using --resetserver without --server makes no sense"
sys.exit(1)
raise OptionError("Using --resetserver without --server makes no sense", "resetserver")
log_dir = 'logs'
if not os.path.isdir(log_dir):

7
fdroidserver/install.py
View File

@ -21,7 +21,7 @@
import sys
import os
import glob
from optparse import OptionParser
from optparse import OptionParser, OptionError
import common
from common import FDroidPopen
@ -49,15 +49,14 @@ def main():
(options, args) = parser.parse_args()
if not args and not options.all:
print "If you really want to install all the signed apps, use --all"
sys.exit(1)
raise OptionError("If you really want to install all the signed apps, use --all", "all")
config = common.read_config(options)
output_dir = 'repo'
if not os.path.isdir(output_dir):
print "No signed output directory - nothing to do"
sys.exit(1)
sys.exit(0)
if args: