From 1c6bc288d9c124cebe61b5fdaff3c6c8dc60cdd1 Mon Sep 17 00:00:00 2001 From: Yossi Itigin Date: Fri, 14 Jan 2022 13:03:06 +0200 Subject: [PATCH] CONTRIB/PR_MERGE: Script fixes - Fix verbose print access to removed field - Call destructor __del__ before exit to avoid access to unloaded module shutil --- contrib/pr_merge_check.py | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/contrib/pr_merge_check.py b/contrib/pr_merge_check.py index bc7b963ac7d..25981b023de 100755 --- a/contrib/pr_merge_check.py +++ b/contrib/pr_merge_check.py @@ -113,7 +113,8 @@ def merge(self, commit): self.repo.git.merge(self.base_commit, m='Merge %s' % commit) if self.verbose: print(" - merge of %s to %s is %s" % - (commit[:7], self.base_commit, str(self.repo.head.commit)[:7])) + (commit[:7], self.base_commit[:7], + str(self.repo.head.commit)[:7])) return self.repo.head.commit def parse_args(self, argv): @@ -171,7 +172,8 @@ def main(self, argv): if self.verbose: print("comparing %s and %s when merged to %s" % - (self.approved_commit[:7], self.head_commit[:7], self.target_branch)) + (self.approved_commit[:7], self.head_commit[:7], + self.base_commit[:7])) merge_approved = self.merge(self.approved_commit) merge_head = self.merge(self.head_commit) @@ -182,9 +184,10 @@ def main(self, argv): return 0 self.print_diff(diff) + self.remove_temp_dir() return 1 if __name__ == "__main__": - checker = PRChecker() - sys.exit(checker.main(sys.argv)) + rc = PRChecker().main(sys.argv) + sys.exit(rc)