mirror of
https://github.com/sphinx-doc/sphinx.git
synced 2025-02-25 18:55:22 -06:00
Quickstart should return an error consistently on all error conditions
fixes #2955, connected to #2955
This commit is contained in:
1
CHANGES
1
CHANGES
@@ -4,6 +4,7 @@ Release 1.4.7 (in development)
|
||||
Bugs fixed
|
||||
----------
|
||||
|
||||
* #2890: Quickstart should return an error consistently on all error conditions
|
||||
* #2870: flatten genindex columns' heights.
|
||||
* #2856: Search on generated HTML site doesnt find some symbols
|
||||
* #2882: Fall back to a GET request on 403 status in linkcheck
|
||||
|
||||
@@ -1646,7 +1646,7 @@ def main(argv=sys.argv):
|
||||
if not set(['project', 'author', 'version']).issubset(d):
|
||||
print('''"quiet" is specified, but any of "project", \
|
||||
"author" or "version" is not specified.''')
|
||||
return
|
||||
return 1
|
||||
|
||||
if set(['quiet', 'project', 'author', 'version']).issubset(d):
|
||||
# quiet mode with all required params satisfied, use default
|
||||
@@ -1666,13 +1666,13 @@ def main(argv=sys.argv):
|
||||
' files already exist.'))
|
||||
print('sphinx-quickstart only generate into a empty directory.'
|
||||
' Please specify a new root path.')
|
||||
return
|
||||
return 1
|
||||
else:
|
||||
ask_user(d)
|
||||
except (KeyboardInterrupt, EOFError):
|
||||
print()
|
||||
print('[Interrupted.]')
|
||||
return
|
||||
return 130 # 128 + SIGINT
|
||||
|
||||
# decode values in d if value is a Python string literal
|
||||
for key, value in d.items():
|
||||
|
||||
Reference in New Issue
Block a user