From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp-out2.suse.de (smtp-out2.suse.de [195.135.220.29]) by sourceware.org (Postfix) with ESMTPS id 4638C3872574 for ; Mon, 12 Dec 2022 12:25:23 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4638C3872574 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=suse.cz Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by smtp-out2.suse.de (Postfix) with ESMTPS id 533AB20DA5; Mon, 12 Dec 2022 12:25:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_rsa; t=1670847922; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1d7c2tSRlxjYVE3PNj2qBA8Aid4KwF4NKM9nmSJmXA=; b=luT4q37o9VlFiL0yCnBPh83Mu/YrZu6ED0GGA/DpEoCJJTVBxi1237ox/xnB4X0I0a7yWN MVWxqvifpxA0mD7hZmpwyMJ6HMEJYg/IVJiVsxl2zHvY1J0fGf4DP0pcMerFuX9lVJiImx BjCsaIeedZB+OtEry0VjnTKpL9IcLf0= DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.cz; s=susede2_ed25519; t=1670847922; h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc: mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p1d7c2tSRlxjYVE3PNj2qBA8Aid4KwF4NKM9nmSJmXA=; b=cBFEdwZOV6RS12oLpNhlir+RAGm0fZiDwYpX1ilIYj2v0EzmhP310zrSSVLPFbCLyiYJL+ Y3DXSGDndgh8XEAA== Received: from imap2.suse-dmz.suse.de (imap2.suse-dmz.suse.de [192.168.254.74]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-521) server-digest SHA512) (No client certificate requested) by imap2.suse-dmz.suse.de (Postfix) with ESMTPS id 40D14138F3; Mon, 12 Dec 2022 12:25:22 +0000 (UTC) Received: from dovecot-director2.suse.de ([192.168.254.65]) by imap2.suse-dmz.suse.de with ESMTPSA id geTLDrIdl2NPfAAAMHmgww (envelope-from ); Mon, 12 Dec 2022 12:25:22 +0000 Message-ID: Date: Mon, 12 Dec 2022 13:25:21 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.5.1 From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Subject: [PATCH (pushed)] mklog: do not parse binary file for PR entry To: gcc-patches@gcc.gnu.org Content-Language: en-US Cc: Thomas Schwinge Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,SPF_HELO_NONE,SPF_PASS,TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: contrib/ChangeLog: * mklog.py: Do not search PR entry in a file that is binary. --- 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) -- 2.38.1