commit: 1c4fc5a149952a22b74a8d0fc498716ee5c7dfa8
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 26 17:47:40 2020 +0000
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> 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 <floppym <AT> 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:
