[Python-checkins] r56773 - doctools/trunk/sphinx/builder.py

[georg.brandl]

Author: georg.brandl
Date: Mon Aug  6 18:54:17 2007
New Revision: 56773

Modified:
   doctools/trunk/sphinx/builder.py
Log:
Apply config overrides before searching for version info.


Modified: doctools/trunk/sphinx/builder.py
==============================================================================
--- doctools/trunk/sphinx/builder.py	(original)
+++ doctools/trunk/sphinx/builder.py	Mon Aug  6 18:54:17 2007
@@ -97,6 +97,8 @@
         for key, val in self.config.items():
             if isinstance(val, types.ModuleType):
                 del self.config[key]
+        if confoverrides:
+            self.config.update(confoverrides)
         # replace version info if 'auto'
         if self.config['version'] == 'auto' or self.config['revision'] == 'auto':
             try:
@@ -109,8 +111,6 @@
                 self.config['version'] = version
             if self.config['release'] == 'auto':
                 self.config['release'] = release
-        if confoverrides:
-            self.config.update(confoverrides)
 
         self.status_stream = status_stream or sys.stdout
         self.warning_stream = warning_stream or sys.stderr