Merge tag 'upstream/2.3.1'

Upstream version 2.3.1

1 files changed, 11 insertions, 10 deletions

diff --git a/bin/update-release-info.py b/bin/update-release-info.py
index 1b3015a..b8c50bd 100644
--- a/bin/update-release-info.py
+++ b/bin/update-release-info.py
@@ -36,7 +36,7 @@ In 'post' mode, files are prepared for the next release cycle:
     src/Announce.txt.
 """
 #
-# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 The SCons Foundation
+# Copyright (c) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 The SCons Foundation
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -57,7 +57,7 @@ In 'post' mode, files are prepared for the next release cycle:
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
-__revision__ = "bin/update-release-info.py  2013/03/03 09:48:35 garyo"
+__revision__ = "bin/update-release-info.py  2014/03/02 14:18:15 garyo"
 
 import os
 import sys
@@ -333,17 +333,18 @@ t.replace_assign('deprecated_python_version', str(deprecated_version))
 # Update doc/user/main.{in,xml}
 
 docyears = ', '.join(map(str, iter(range(2004, release_date[0] + 1))))
-t = UpdateFile(os.path.join('doc', 'user', 'main.in'))
-if DEBUG: t.file = '/tmp/main.in'
-## TODO debug these
-#t.sub('<pubdate>[^<]*</pubdate>', '<pubdate>' + docyears + '</pubdate>')
-#t.sub('<year>[^<]*</year>', '<year>' + docyears + '</year>')
+if os.path.exists(os.path.join('doc', 'user', 'main.in')):
+    # this is no longer used as of Dec 2013
+    t = UpdateFile(os.path.join('doc', 'user', 'main.in'))
+    if DEBUG: t.file = '/tmp/main.in'
+    ## TODO debug these
+    #t.sub('<pubdate>[^<]*</pubdate>', '<pubdate>' + docyears + '</pubdate>')
+    #t.sub('<year>[^<]*</year>', '<year>' + docyears + '</year>')
 
 t = UpdateFile(os.path.join('doc', 'user', 'main.xml'))
 if DEBUG: t.file = '/tmp/main.xml'
-## TODO debug these
-#t.sub('<pubdate>[^<]*</pubdate>', '<pubdate>' + docyears + '</pubdate>')
-#t.sub('<year>[^<]*</year>', '<year>' + docyears + '</year>')
+t.sub('<pubdate>[^<]*</pubdate>', '<pubdate>' + docyears + '</pubdate>')
+t.sub('<year>[^<]*</year>', '<year>' + docyears + '</year>')
 
 # Write out the last update