diff options
| author | Georg Brandl <georg@python.org> | 2009-12-31 09:47:56 +0100 |
|---|---|---|
| committer | Georg Brandl <georg@python.org> | 2009-12-31 09:47:56 +0100 |
| commit | 096725922a8a9c6b1a905bae4f5ca1f2f8b4edb9 (patch) | |
| tree | 0e425f71cc7383987b45938949134f813dd62bc2 /sphinx/cmdline.py | |
| parent | 93cca3d4ac1218d7187083b544528a336f394e73 (diff) | |
| download | sphinx-git-096725922a8a9c6b1a905bae4f5ca1f2f8b4edb9.tar.gz | |
#303: ``html_context`` values given on the command line via ``-A``
should not override other values given in conf.py.
Diffstat (limited to 'sphinx/cmdline.py')
| -rw-r--r-- | sphinx/cmdline.py | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sphinx/cmdline.py b/sphinx/cmdline.py index 898678b72..ae8b076b2 100644 --- a/sphinx/cmdline.py +++ b/sphinx/cmdline.py @@ -96,7 +96,6 @@ def main(argv): error = sys.stderr warnfile = None confoverrides = {} - htmlcontext = {} tags = [] doctreedir = path.join(outdir, '.doctrees') for opt, val in opts: @@ -142,7 +141,7 @@ def main(argv): val = int(val) except ValueError: pass - htmlcontext[key] = val + confoverrides['html_context.%s' % key] = val elif opt == '-N': nocolor() elif opt == '-E': @@ -158,7 +157,6 @@ def main(argv): warnfile = val elif opt == '-P': use_pdb = True - confoverrides['html_context'] = htmlcontext if warning and warnfile: warnfp = open(warnfile, 'w') |