IntenseWebs/sphinx
3
0
Fork 0
mirror of https://github.com/sphinx-doc/sphinx.git synced 2025-02-25 18:55:22 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix #5557: quickstart: --no-batchfile isn't honored

Browse Source
This commit is contained in:
Takeshi KOMIYA
2018-11-01 01:00:33 +09:00
parent f4d7b2e60e
commit 5755b6aeb8
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES
View File

@@ -32,6 +32,7 @@ Bugs fixed
* #5419: incompatible math_block node has been generated
* #5548: Fix ensuredir() in case of pre-existing file
* #5549: graphviz Correctly deal with non-existing static dir
* #5557: quickstart: --no-batchfile isn't honored
Testing
--------

10
sphinx/cmd/quickstart.py
View File

@@ -543,7 +543,7 @@ Makefile to be used with sphinx-build.
"""))
parser.add_argument('-q', '--quiet', action='store_true', dest='quiet',
default=False,
default=None,
help=__('quiet mode'))
parser.add_argument('--version', action='version', dest='show_version',
version='%%(prog)s %s' % __display_version__)
@@ -552,7 +552,7 @@ Makefile to be used with sphinx-build.
help=__('output path'))
group = parser.add_argument_group(__('Structure options'))
group.add_argument('--sep', action='store_true',
group.add_argument('--sep', action='store_true', default=None,
help=__('if specified, separate source and build dirs'))
group.add_argument('--dot', metavar='DOT',
help=__('replacement for dot in _templates etc.'))
@@ -584,11 +584,11 @@ Makefile to be used with sphinx-build.
action='append', help=__('enable arbitrary extensions'))
group = parser.add_argument_group(__('Makefile and Batchfile creation'))
group.add_argument('--makefile', action='store_true', dest='makefile',
group.add_argument('--makefile', action='store_true', dest='makefile', default=None,
help=__('create makefile'))
group.add_argument('--no-makefile', action='store_false', dest='makefile',
help=__('do not create makefile'))
group.add_argument('--batchfile', action='store_true', dest='batchfile',
group.add_argument('--batchfile', action='store_true', dest='batchfile', default=None,
help=__('create batchfile'))
group.add_argument('--no-batchfile', action='store_false',
dest='batchfile',
@@ -628,7 +628,7 @@ def main(argv=sys.argv[1:]):
d = vars(args)
# delete None or False value
d = dict((k, v) for k, v in d.items() if not (v is None or v is False))
d = dict((k, v) for k, v in d.items() if v is not None)
try:
if 'quiet' in d: