From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5CF40138359 for ; Mon, 26 Oct 2020 17:48:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9B32FE0896; Mon, 26 Oct 2020 17:48:13 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 7DEA5E0896 for ; Mon, 26 Oct 2020 17:48:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3A045340CFE for ; Mon, 26 Oct 2020 17:48:11 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8BA6C3B1 for ; Mon, 26 Oct 2020 17:48:09 +0000 (UTC) From: "Mike Gilbert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Gilbert" Message-ID: <1603734460.1c4fc5a149952a22b74a8d0fc498716ee5c7dfa8.floppym@gentoo> Subject: [gentoo-commits] proj/chromium-tools:master commit in: / X-VCS-Repository: proj/chromium-tools X-VCS-Files: chrome-bump X-VCS-Directories: / X-VCS-Committer: floppym X-VCS-Committer-Name: Mike Gilbert X-VCS-Revision: 1c4fc5a149952a22b74a8d0fc498716ee5c7dfa8 X-VCS-Branch: master Date: Mon, 26 Oct 2020 17:48:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d34e75d0-4c20-4f06-9ed6-a6e9c313da45 X-Archives-Hash: c8a7c8daf0c19f746670e02454dba522 commit: 1c4fc5a149952a22b74a8d0fc498716ee5c7dfa8 Author: Mike Gilbert gentoo org> AuthorDate: Mon Oct 26 17:47:40 2020 +0000 Commit: Mike Gilbert gentoo org> CommitDate: Mon Oct 26 17:47:40 2020 +0000 URL: https://gitweb.gentoo.org/proj/chromium-tools.git/commit/?id=1c4fc5a1 Update chrome-bump script Signed-off-by: Mike Gilbert gentoo.org> chrome-bump | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/chrome-bump b/chrome-bump index d8df1fc..1b138e5 100755 --- a/chrome-bump +++ b/chrome-bump @@ -51,7 +51,7 @@ def get_deb_release(archive, dist): def get_deb_packages(archive, dist, comp, arch): url = '%s/dists/%s/%s/binary-%s/Packages' % (archive, dist, comp, arch) with closing(urlopen(url)) as fp: - return list(deb822.Packages.iter_paragraphs(fp)) + return list(deb822.Packages.iter_paragraphs(fp, use_apt_pkg=False)) def ebuild_pvr(pn, ebuild): return ebuild[len(pn) + 1 : -7] @@ -82,11 +82,15 @@ def sync_ebuilds(pkg, debs): os.chdir(os.path.join(PORTDIR, pkg)) pn = pkg.split('/')[1] changed = False + new_versions = [] for pattern in PKGMAP[pkg]: (sep, name) = PKGMAP[pkg][pattern] ebuilds = sorted(glob(pattern), reverse=True) + if not ebuilds: + continue + for deb in debs: if deb['Package'] != name: continue @@ -99,6 +103,7 @@ def sync_ebuilds(pkg, debs): break if not found: copy_ebuild(ebuilds[0], new_ebuild(pn, version, sep, '')) + new_versions.append(version) changed = True for ebuild in ebuilds: @@ -119,7 +124,10 @@ def sync_ebuilds(pkg, debs): if ARGS.commit: print('repoman commit') if not ARGS.dry_run: - subprocess.check_call(['repoman', 'commit', '-S', '-m', pkg + ': automated update']) + message = '%s: automated update (%s)' % (pkg, ', '.join(new_versions)) + if len(message) > 69: + message = '%s: automated update' % pkg + subprocess.check_call(['repoman', 'commit', '-S', '-m', message]) else: print('repoman manifest') if not ARGS.dry_run: