Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 1507C181A9 for ; Tue, 7 Jul 2015 21:31:01 +0000 (UTC) Received: (qmail 76328 invoked by uid 500); 7 Jul 2015 21:31:00 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 76261 invoked by uid 500); 7 Jul 2015 21:31:00 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 76131 invoked by uid 99); 7 Jul 2015 21:31:00 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 07 Jul 2015 21:31:00 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 60797E3A9D; Tue, 7 Jul 2015 21:31:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: aw@apache.org To: common-commits@hadoop.apache.org Date: Tue, 07 Jul 2015 21:31:01 -0000 Message-Id: In-Reply-To: <888c9d9f91434fbda765e4d3c02d0242@git.apache.org> References: <888c9d9f91434fbda765e4d3c02d0242@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] hadoop git commit: HADOOP-12202. releasedocmaker drops missing component and assignee entries (aw) HADOOP-12202. releasedocmaker drops missing component and assignee entries (aw) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/adbacf70 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/adbacf70 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/adbacf70 Branch: refs/heads/HADOOP-12111 Commit: adbacf7010373dbe6df239688b4cebd4a93a69e4 Parents: 38190e8 Author: Allen Wittenauer Authored: Tue Jul 7 14:30:32 2015 -0700 Committer: Allen Wittenauer Committed: Tue Jul 7 14:30:32 2015 -0700 ---------------------------------------------------------------------- dev-support/releasedocmaker.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/adbacf70/dev-support/releasedocmaker.py ---------------------------------------------------------------------- diff --git a/dev-support/releasedocmaker.py b/dev-support/releasedocmaker.py index 6e01260..409d8e3 100755 --- a/dev-support/releasedocmaker.py +++ b/dev-support/releasedocmaker.py @@ -420,6 +420,8 @@ def main(): else: title=options.title + haderrors=False + for v in versions: vstr=str(v) jlist = JiraIter(vstr,projects) @@ -468,14 +470,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": @@ -496,6 +490,7 @@ def main(): notableclean(jira.getSummary())) if (jira.getIncompatibleChange()) and (len(jira.getReleaseNote())==0): + warningCount+=1 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' @@ -503,9 +498,11 @@ def main(): reloutputs.writeKeyRaw(jira.getProject(), line) if jira.checkVersionString(): + warningCount+=1 lintMessage += "\nWARNING: Version string problem for %s " % jira.getId() if (jira.checkMissingComponent() or jira.checkMissingAssignee()): + errorCount+=1 errorMessage=[] jira.checkMissingComponent() and errorMessage.append("component") jira.checkMissingAssignee() and errorMessage.append("assignee") @@ -520,11 +517,11 @@ def main(): if (options.lint is True): print lintMessage print "=======================================" - print "Error:%d, Warning:%d \n" % (errorCount, warningCount) - + print "%s: Error:%d, Warning:%d \n" % (vstr, errorCount, warningCount) if (errorCount>0): - cleanOutputDir(version) - sys.exit(1) + haderrors=True + cleanOutputDir(vstr) + continue reloutputs.writeAll("\n\n") reloutputs.close() @@ -571,5 +568,8 @@ def main(): if options.index: buildindex(title,options.license) + if haderrors is True: + sys.exit(1) + if __name__ == "__main__": main()