[Python-checkins] r61801 - in doctools/trunk: CHANGES sphinx/quickstart.py

[georg.brandl]

Author: georg.brandl
Date: Sun Mar 23 18:33:50 2008
New Revision: 61801

Modified:
   doctools/trunk/CHANGES
   doctools/trunk/sphinx/quickstart.py
Log:
Python #2465: don't create makefile if not prompted to do so.


Modified: doctools/trunk/CHANGES
==============================================================================
--- doctools/trunk/CHANGES	(original)
+++ doctools/trunk/CHANGES	Sun Mar 23 18:33:50 2008
@@ -1,3 +1,9 @@
+Changes in trunk
+================
+
+* sphinx.quickstart: Really don't create a makefile if the user
+  doesn't want one.
+
 Release 0.1.61798 (Mar 23, 2008)
 ================================
 

Modified: doctools/trunk/sphinx/quickstart.py
==============================================================================
--- doctools/trunk/sphinx/quickstart.py	(original)
+++ doctools/trunk/sphinx/quickstart.py	Sun Mar 23 18:33:50 2008
@@ -375,7 +375,8 @@
     f.write(MASTER_FILE % d)
     f.close()
 
-    if d['makefile']:
+    create_makefile = d['makefile'].upper() in ('Y', 'YES')
+    if create_makefile:
         d['rsrcdir'] = separate and 'source' or '.'
         d['rbuilddir'] = separate and 'build' or d['dot'] + 'build'
         f = open(path.join(d['path'], 'Makefile'), 'w')
@@ -387,7 +388,7 @@
     print '''
 You should now populate your master file %s and create other documentation
 source files. Use the sphinx-build.py script to build the docs, like so:
-''' % masterfile + (d['makefile'] and '''
+''' % masterfile + (create_makefile and '''
    make <builder>
 ''' or '''
    sphinx-build.py -b <builder> %s %s