Updated Branches: refs/heads/sqoop2 d62567ddf -> 60a909f30
SQOOP-1104. Sqoop2: Allow versioned patches in the PreCommit hook (Jarek Jarcec Cecho via Hari Shreedharan) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/60a909f3 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/60a909f3 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/60a909f3 Branch: refs/heads/sqoop2 Commit: 60a909f30b9705cf9a0339a0a76932cf1c0deb8a Parents: d62567d Author: Hari Shreedharan <[email protected]> Authored: Tue Jun 25 16:24:53 2013 -0700 Committer: Hari Shreedharan <[email protected]> Committed: Tue Jun 25 16:24:53 2013 -0700 ---------------------------------------------------------------------- dev-support/test-patch.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/60a909f3/dev-support/test-patch.py ---------------------------------------------------------------------- diff --git a/dev-support/test-patch.py b/dev-support/test-patch.py index d909b7f..b826450 100755 --- a/dev-support/test-patch.py +++ b/dev-support/test-patch.py @@ -135,7 +135,7 @@ def jira_post_comment(result, defect, branch, username, password): # hack (from hadoop) but REST api doesn't list attachments? def jira_get_attachment(result, defect, username, password): html = jira_get_defect_html(result, defect, username, password) - pattern = "(/secure/attachment/[0-9]+/(bug)?%s[0-9\-]*\.(patch|txt|patch\.txt))" % (re.escape(defect)) + pattern = "(/secure/attachment/[0-9]+/(bug)?%s[0-9\-]*((\.|-)[0-9]+)?\.(patch|txt|patch\.txt))" % (re.escape(defect)) matches = [] for match in re.findall(pattern, html, re.IGNORECASE): matches += [ match[0] ]
