From 2c1a21704d618bbeda9b1fb40ad078bdee2dfb03 Mon Sep 17 00:00:00 2001 From: Jimmy Berry Date: Tue, 20 Jun 2017 16:31:25 -0500 Subject: [PATCH] ReviewBot: copy default review messages before each review. --- ReviewBot.py | 3 +++ check_source.py | 6 ------ leaper.py | 1 - 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ReviewBot.py b/ReviewBot.py index 48b3ab59..f497e377 100644 --- a/ReviewBot.py +++ b/ReviewBot.py @@ -215,6 +215,9 @@ class ReviewBot(object): return None if nothing to do, True to accept, False to reject """ + # Copy original values to revert changes made to them. + self.review_messages = self.DEFAULT_REVIEW_MESSAGES.copy() + if self.only_one_action and len(req.actions) != 1: self.review_messages['declined'] = 'Only one action per request' return False diff --git a/check_source.py b/check_source.py index 19be9993..6a2f3395 100755 --- a/check_source.py +++ b/check_source.py @@ -32,12 +32,6 @@ class CheckSource(ReviewBot.ReviewBot): self.staging_group = 'factory-staging' self.skip_add_reviews = False - def check_one_request(self, request): - # Copy original values to revert changes made to them. - self.review_messages = self.DEFAULT_REVIEW_MESSAGES.copy() - - return super(CheckSource, self).check_one_request(request) - def check_source_submission(self, source_project, source_package, source_revision, target_project, target_package): super(CheckSource, self).check_source_submission(source_project, source_package, source_revision, target_project, target_package) diff --git a/leaper.py b/leaper.py index e42e9a5d..62a8f9cf 100755 --- a/leaper.py +++ b/leaper.py @@ -402,7 +402,6 @@ class Leaper(ReviewBot.ReviewBot): return False def check_one_request(self, req): - self.review_messages = self.DEFAULT_REVIEW_MESSAGES.copy() self.needs_legal_review = False self.needs_reviewteam = False self.needs_release_manager = False