You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by aw...@apache.org on 2015/07/08 17:06:44 UTC
hadoop git commit: Revert "HADOOP-11807. add a lint mode to
releasedocmaker (ramtin via aw)"
Repository: hadoop
Updated Branches:
refs/heads/trunk bd4e10900 -> 98e59261b
Revert "HADOOP-11807. add a lint mode to releasedocmaker (ramtin via aw)"
This reverts commit 79ed0f959ffc490414ca56a73e026500c24e7078.
Conflicts:
hadoop-common-project/hadoop-common/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/98e59261
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/98e59261
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/98e59261
Branch: refs/heads/trunk
Commit: 98e59261b7fb6f9d6d10a5c897f62222da7d2a1f
Parents: bd4e109
Author: Allen Wittenauer <aw...@apache.org>
Authored: Wed Jul 8 08:06:30 2015 -0700
Committer: Allen Wittenauer <aw...@apache.org>
Committed: Wed Jul 8 08:06:30 2015 -0700
----------------------------------------------------------------------
dev-support/releasedocmaker.py | 76 +++-----------------
hadoop-common-project/hadoop-common/CHANGES.txt | 2 -
2 files changed, 10 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/98e59261/dev-support/releasedocmaker.py
----------------------------------------------------------------------
diff --git a/dev-support/releasedocmaker.py b/dev-support/releasedocmaker.py
index 8e68b3c..2ccc1c0 100755
--- a/dev-support/releasedocmaker.py
+++ b/dev-support/releasedocmaker.py
@@ -87,15 +87,8 @@ def notableclean(str):
str=str.rstrip()
return str
-# clean output dir
-def cleanOutputDir(dir):
- files = os.listdir(dir)
- for name in files:
- os.remove(os.path.join(dir,name))
- os.rmdir(dir)
-
def mstr(obj):
- if (obj is None):
+ if (obj == None):
return ""
return unicode(obj)
@@ -155,7 +148,7 @@ class Jira:
return mstr(self.fields['description'])
def getReleaseNote(self):
- if (self.notes is None):
+ if (self.notes == None):
field = self.parent.fieldIdMap['Release Note']
if (self.fields.has_key(field)):
self.notes=mstr(self.fields[field])
@@ -166,14 +159,14 @@ class Jira:
def getPriority(self):
ret = ""
pri = self.fields['priority']
- if(pri is not None):
+ if(pri != None):
ret = pri['name']
return mstr(ret)
def getAssignee(self):
ret = ""
mid = self.fields['assignee']
- if(mid is not None):
+ if(mid != None):
ret = mid['displayName']
return mstr(ret)
@@ -189,21 +182,21 @@ class Jira:
def getType(self):
ret = ""
mid = self.fields['issuetype']
- if(mid is not None):
+ if(mid != None):
ret = mid['name']
return mstr(ret)
def getReporter(self):
ret = ""
mid = self.fields['reporter']
- if(mid is not None):
+ if(mid != None):
ret = mid['displayName']
return mstr(ret)
def getProject(self):
ret = ""
mid = self.fields['project']
- if(mid is not None):
+ if(mid != None):
ret = mid['key']
return mstr(ret)
@@ -221,7 +214,7 @@ class Jira:
return False
def getIncompatibleChange(self):
- if (self.incompat is None):
+ if (self.incompat == None):
field = self.parent.fieldIdMap['Hadoop Flags']
self.reviewed=False
self.incompat=False
@@ -234,24 +227,6 @@ class Jira:
self.reviewed=True
return self.incompat
- def checkMissingComponent(self):
- if (len(self.fields['components'])>0):
- return False
- return True
-
- def checkMissingAssignee(self):
- if (self.fields['assignee'] is not None):
- return False
- return True
-
- def checkVersionString(self):
- field = self.parent.fieldIdMap['Fix Version/s']
- for h in self.fields[field]:
- found = re.match('^((\d+)(\.\d+)*).*$|^(\w+\-\d+)$', h['name'])
- if not found:
- return True
- return False
-
def getReleaseDate(self,version):
for j in range(len(self.fields['fixVersions'])):
if self.fields['fixVersions'][j]==version:
@@ -364,11 +339,9 @@ def main():
help="build an index file")
parser.add_option("-u","--usetoday", dest="usetoday", action="store_true",
help="use current date for unreleased versions")
- parser.add_option("-n","--lint", dest="lint", action="store_true",
- help="use lint flag to exit on failures")
(options, args) = parser.parse_args()
- if (options.versions is None):
+ if (options.versions == None):
options.versions = []
if (len(args) > 2):
@@ -423,9 +396,6 @@ def main():
reloutputs.writeAll(relhead)
choutputs.writeAll(chhead)
- errorCount=0
- warningCount=0
- lintMessage=""
incompatlist=[]
buglist=[]
improvementlist=[]
@@ -438,14 +408,6 @@ def main():
for jira in sorted(jlist):
if jira.getIncompatibleChange():
incompatlist.append(jira)
- if (len(jira.getReleaseNote())==0):
- warningCount+=1
-
- if jira.checkVersionString():
- warningCount+=1
-
- if jira.checkMissingComponent() or jira.checkMissingAssignee():
- errorCount+=1
elif jira.getType() == "Bug":
buglist.append(jira)
elif jira.getType() == "Improvement":
@@ -469,33 +431,15 @@ def main():
reloutputs.writeKeyRaw(jira.getProject(),"\n---\n\n")
reloutputs.writeKeyRaw(jira.getProject(), line)
line ='\n**WARNING: No release note provided for this incompatible change.**\n\n'
- lintMessage += "\nWARNING: incompatible change %s lacks release notes." % (notableclean(jira.getId()))
+ print 'WARNING: incompatible change %s lacks release notes.' % (notableclean(jira.getId()))
reloutputs.writeKeyRaw(jira.getProject(), line)
- if jira.checkVersionString():
- lintMessage += "\nWARNING: Version string problem for %s " % jira.getId()
-
- if (jira.checkMissingComponent() or jira.checkMissingAssignee()):
- errorMessage=[]
- jira.checkMissingComponent() and errorMessage.append("component")
- jira.checkMissingAssignee() and errorMessage.append("assignee")
- lintMessage += "\nERROR: missing %s for %s " % (" and ".join(errorMessage) , jira.getId())
-
if (len(jira.getReleaseNote())>0):
reloutputs.writeKeyRaw(jira.getProject(),"\n---\n\n")
reloutputs.writeKeyRaw(jira.getProject(), line)
line ='\n%s\n\n' % (tableclean(jira.getReleaseNote()))
reloutputs.writeKeyRaw(jira.getProject(), line)
- if (options.lint is True):
- print lintMessage
- print "======================================="
- print "Error:%d, Warning:%d \n" % (errorCount, warningCount)
-
- if (errorCount>0):
- cleanOutputDir(version)
- sys.exit(1)
-
reloutputs.writeAll("\n\n")
reloutputs.close()
http://git-wip-us.apache.org/repos/asf/hadoop/blob/98e59261/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index 859e58a..8ab109d 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -230,8 +230,6 @@ Trunk (Unreleased)
HADOOP-11142. Remove hdfs dfs reference from file system shell
documentation (Kengo Seki via aw)
- HADOOP-11807. add a lint mode to releasedocmaker (ramtin via aw)
-
HADOOP-12149. copy all of test-patch BINDIR prior to re-exec (aw)
BUG FIXES