From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1851) id 81BDB38B0BC9; Mon, 12 Dec 2022 12:25:35 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 81BDB38B0BC9 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670847935; bh=bmamX19195iPuiESF4htXjiSGCJgZZEEPdBMQSYgFaw=; h=From:To:Subject:Date:From; b=DJRNAHO04ifBHQYgy4Bsc7sV9J3rdyPG2iOTjejq6brku+58bwVfB/eQtlkyYsg+i MYUNbLgrJTPYAzuEODYQGHKy/+U5YSnyjt2jGCq1C0FZgNqIJUDnbC7OK4VKkkq9nP 1eSACB45RET1LngsBYMjzrHUFfh772v/8wOlXelY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Martin Liska To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4610] mklog: do not parse binary file for PR entry X-Act-Checkin: gcc X-Git-Author: Martin Liska X-Git-Refname: refs/heads/master X-Git-Oldrev: 688f4eb28186daf333f7a7f5b1bdc1df43bb6c47 X-Git-Newrev: 14d0f82cab37b66e2998b8d0d664711bd1e1371b Message-Id: <20221212122535.81BDB38B0BC9@sourceware.org> Date: Mon, 12 Dec 2022 12:25:35 +0000 (GMT) List-Id: https://gcc.gnu.org/g:14d0f82cab37b66e2998b8d0d664711bd1e1371b commit r13-4610-g14d0f82cab37b66e2998b8d0d664711bd1e1371b Author: Martin Liska Date: Mon Dec 12 13:24:25 2022 +0100 mklog: do not parse binary file for PR entry contrib/ChangeLog: * mklog.py: Do not search PR entry in a file that is binary. Diff: --- contrib/mklog.py | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/contrib/mklog.py b/contrib/mklog.py index 3a6ec681b65..358b7fc6b8b 100755 --- a/contrib/mklog.py +++ b/contrib/mklog.py @@ -186,23 +186,25 @@ def generate_changelog(data, no_functions=False, fill_pr_titles=False, # contains commented code which a note that it # has not been tested due to a certain PR or DR. this_file_prs = [] - for line in list(file)[0][0:10]: - m = pr_regex.search(line.value) - if m: - pr = m.group('pr') - if pr not in prs: - prs.append(pr) - this_file_prs.append(pr.split('/')[-1]) - else: - m = dr_regex.search(line.value) + if not file.is_binary_file: + for line in list(file)[0][0:10]: + m = pr_regex.search(line.value) if m: - dr = m.group('dr') - if dr not in prs: - prs.append(dr) - this_file_prs.append(dr.split('/')[-1]) - elif dg_regex.search(line.value): - # Found dg-warning/dg-error line - break + pr = m.group('pr') + if pr not in prs: + prs.append(pr) + this_file_prs.append(pr.split('/')[-1]) + else: + m = dr_regex.search(line.value) + if m: + dr = m.group('dr') + if dr not in prs: + prs.append(dr) + this_file_prs.append(dr.split('/')[-1]) + elif dg_regex.search(line.value): + # Found dg-warning/dg-error line + break + # PR number in the file name fname = os.path.basename(file.path) m = pr_filename_regex.search(fname)