Kaynağa Gözat

HADOOP-11813. releasedocmaker.py should use today's date instead of unreleased (Darrell Taylor via aw)

(cherry picked from commit f325522c1423f89dced999a16d49a004b2879743)
Allen Wittenauer 10 yıl önce
ebeveyn
işleme
fed9f767b1

+ 6 - 0
dev-support/releasedocmaker.py

@@ -18,6 +18,7 @@
 
 
 from glob import glob
 from glob import glob
 from optparse import OptionParser
 from optparse import OptionParser
+from time import gmtime, strftime
 import os
 import os
 import re
 import re
 import sys
 import sys
@@ -82,6 +83,7 @@ def notableclean(str):
   str=str.replace("|","\|")
   str=str.replace("|","\|")
   str=str.replace("<","\<")
   str=str.replace("<","\<")
   str=str.replace(">","\>")
   str=str.replace(">","\>")
+  str=str.replace("*","\*")
   str=str.rstrip()
   str=str.rstrip()
   return str
   return str
 
 
@@ -335,6 +337,8 @@ def main():
              help="only create the master, merged project files")
              help="only create the master, merged project files")
   parser.add_option("-i","--index", dest="index", action="store_true",
   parser.add_option("-i","--index", dest="index", action="store_true",
              help="build an index file")
              help="build an index file")
+  parser.add_option("-u","--usetoday", dest="usetoday", action="store_true",
+             help="use current date for unreleased versions")
   (options, args) = parser.parse_args()
   (options, args) = parser.parse_args()
 
 
   if (options.versions == None):
   if (options.versions == None):
@@ -356,6 +360,8 @@ def main():
 
 
   if version in releaseVersion:
   if version in releaseVersion:
     reldate=releaseVersion[version]
     reldate=releaseVersion[version]
+  elif options.usetoday:
+    reldate=strftime("%Y-%m-%d", gmtime())
   else:
   else:
     reldate="Unreleased"
     reldate="Unreleased"
 
 

+ 4 - 3
hadoop-common-project/hadoop-common/CHANGES.txt

@@ -167,9 +167,10 @@ Release 2.8.0 - UNRELEASED
     HADOOP-11958. MetricsSystemImpl fails to show backtrace when an error
     HADOOP-11958. MetricsSystemImpl fails to show backtrace when an error
     occurs (Jason Lowe via jeagles)
     occurs (Jason Lowe via jeagles)
 
 
-    HADOOP-12158. Improve error message in
-    TestCryptoStreamsWithOpensslAesCtrCryptoCodec when OpenSSL is not
-    installed. (wang)
+    HADOOP-11813. releasedocmaker.py should use today's date instead of
+    unreleased (Darrell Taylor via aw)
+
+  BUG FIXES
 
 
     HADOOP-12124. Add HTrace support for FsShell (cmccabe)
     HADOOP-12124. Add HTrace support for FsShell (cmccabe)
 
 

+ 1 - 0
hadoop-common-project/hadoop-common/pom.xml

@@ -812,6 +812,7 @@
                             <argument>--version</argument>
                             <argument>--version</argument>
                             <argument>${project.version}</argument>
                             <argument>${project.version}</argument>
                             <argument>--index</argument>
                             <argument>--index</argument>
+                            <argument>--usetoday</argument>
                         </arguments>
                         </arguments>
                     </configuration>
                     </configuration>
                 </execution>
                 </execution>