mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
automate-git: Print out invalid options on error
This commit is contained in:
committed by
Marshall Greenblatt
parent
c7d4d9690c
commit
4ae030fec1
@@ -461,6 +461,11 @@ def check_pattern_matches(output_file=None):
|
|||||||
# Don't continue when we know the build will be wrong.
|
# Don't continue when we know the build will be wrong.
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
|
||||||
|
def invalid_options_combination(a, b):
|
||||||
|
print("Invalid combination of options: '%s' and '%s'" % (a, b))
|
||||||
|
parser.print_help(sys.stderr)
|
||||||
|
sys.exit(1)
|
||||||
|
|
||||||
|
|
||||||
##
|
##
|
||||||
# Program entry point.
|
# Program entry point.
|
||||||
@@ -808,14 +813,18 @@ if options.noupdate:
|
|||||||
if options.runtests:
|
if options.runtests:
|
||||||
options.buildtests = True
|
options.buildtests = True
|
||||||
|
|
||||||
if (options.nochromiumupdate and options.forceupdate) or \
|
if (options.nochromiumupdate and options.forceupdate):
|
||||||
(options.nocefupdate and options.forceupdate) or \
|
invalid_options_combination('--no-chromium-update', '--force-update')
|
||||||
(options.nobuild and options.forcebuild) or \
|
if (options.nocefupdate and options.forceupdate):
|
||||||
(options.nodistrib and options.forcedistrib) or \
|
invalid_options_combination('--no-cef-update', '--force-update')
|
||||||
((options.forceclean or options.forcecleandeps) and options.fastupdate):
|
if (options.nobuild and options.forcebuild):
|
||||||
print("Invalid combination of options.")
|
invalid_options_combination('--no-build', '--force-build')
|
||||||
parser.print_help(sys.stderr)
|
if (options.nodistrib and options.forcedistrib):
|
||||||
sys.exit(1)
|
invalid_options_combination('--no-distrib', '--force-distrib')
|
||||||
|
if (options.forceclean and options.fastupdate):
|
||||||
|
invalid_options_combination('--force-clean', '--fast-update')
|
||||||
|
if (options.forcecleandeps and options.fastupdate):
|
||||||
|
invalid_options_combination('--force-clean-deps', '--fast-update')
|
||||||
|
|
||||||
if (options.noreleasebuild and \
|
if (options.noreleasebuild and \
|
||||||
(options.minimaldistrib or options.minimaldistribonly or \
|
(options.minimaldistrib or options.minimaldistribonly or \
|
||||||
|
Reference in New Issue
Block a user