From 98e59261b7fb6f9d6d10a5c897f62222da7d2a1f Mon Sep 17 00:00:00 2001 From: Allen Wittenauer Date: Wed, 8 Jul 2015 08:06:30 -0700 Subject: [PATCH] Revert "HADOOP-11807. add a lint mode to releasedocmaker (ramtin via aw)" This reverts commit 79ed0f959ffc490414ca56a73e026500c24e7078. Conflicts: hadoop-common-project/hadoop-common/CHANGES.txt --- dev-support/releasedocmaker.py | 76 +++---------------- .../hadoop-common/CHANGES.txt | 2 - 2 files changed, 10 insertions(+), 68 deletions(-) diff --git a/dev-support/releasedocmaker.py b/dev-support/releasedocmaker.py index 8e68b3cb9e..2ccc1c0b84 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 @@ def getDescription(self): 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 @@ def getReleaseNote(self): 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 @@ def getSummary(self): 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 @@ def __cmp__(self,other): 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 @@ def getIncompatibleChange(self): 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() diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt index 859e58af3f..8ab109ddd3 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