On Thu, 2019-04-11 at 18:08 -0700, Kevin Fenzi wrote: > On 4/9/19 11:20 AM, Jonathan Dieter wrote: > > On Tue, 2019-04-09 at 19:14 +0100, Jonathan Dieter wrote: > > > This re-adds zchunk support for the updates and updates-testing repositories > > > for both rpms and modularity. > > > > > > Zchunk metadata was turned off due to a broken version of librepo that made it > > > out to stable, but a fixed version has been pushed and FESCo has decided[1] to > > > go ahead and turn this back on. > > > > > > 1: https://pagure.io/fesco/issue/2116 > > > > In that ticket, we didn't really specify when to turn it back on, so if > > we want to sit on this patch for a few days, that's fine with me. > > > > Once we've decided when this should be applied, I'll send a message to > > devel-announce with an explanation on how to workaround the segfault > > for anyone still using librepo-1.9.6-1. > > I think we should apply it asap. > > However, if I save your email and try and git am it, it doesn't apply at > all. > > Can you resend with the patch as attachment? > > I am not sure what thunderbird is doing here. ;( > > kevin Ok, here it is, freshly rebased, as an attachment. Jonathan
From 4c53d3fba04b1bbbfdb8a7dc1d350e75dd5efd5d Mon Sep 17 00:00:00 2001 From: Jonathan Dieter <jdieter@xxxxxxxxx> Date: Sat, 30 Mar 2019 22:29:33 +0000 Subject: [PATCH] bodhi-backend: Add zchunk support to updates and updates-testing repositories This re-adds zchunk support for the updates and updates-testing repositories for both rpms and modularity. Zchunk metadata was turned off due to a broken version of librepo that made it out to stable, but a fixed version has been pushed and FESCo has decided[1] to go ahead and turn this back on. 1: https://pagure.io/fesco/issue/2116 Signed-off-by: Jonathan Dieter <jdieter@xxxxxxxxx> --- roles/bodhi2/backend/templates/pungi.module.conf.j2 | 3 +++ roles/bodhi2/backend/templates/pungi.rpm.conf.j2 | 3 +++ 2 files changed, 6 insertions(+) diff --git a/roles/bodhi2/backend/templates/pungi.module.conf.j2 b/roles/bodhi2/backend/templates/pungi.module.conf.j2 index 43c6a7e5f..b5bb0c1fb 100644 --- a/roles/bodhi2/backend/templates/pungi.module.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.module.conf.j2 @@ -61,6 +61,9 @@ greedy_method = 'build' createrepo_c = True createrepo_checksum = 'sha256' createrepo_deltas = False +[% if release.version_int >= 30 %] +createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/f[[ release.version_int ]]'] +[% endif %] #jigdo create_jigdo = False diff --git a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 index 8d9e9a3f2..020736aee 100644 --- a/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 +++ b/roles/bodhi2/backend/templates/pungi.rpm.conf.j2 @@ -66,6 +66,9 @@ createrepo_deltas = [ ('^Everything$', {'*': True}) ] createrepo_database = True +[% if release.version_int >= 30 %] +createrepo_extra_args = ['--zck', '--zck-dict-dir=/usr/share/fedora-repo-zdicts/f[[ release.version_int ]]'] +[% endif %] # CHECKSUMS media_checksums = ['sha256'] -- 2.21.0
Attachment:
signature.asc
Description: This is a digitally signed message part
_______________________________________________ infrastructure mailing list -- infrastructure@xxxxxxxxxxxxxxxxxxxxxxx To unsubscribe send an email to infrastructure-leave@xxxxxxxxxxxxxxxxxxxxxxx Fedora Code of Conduct: https://getfedora.org/code-of-conduct.html List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines List Archives: https://lists.fedoraproject.org/archives/list/infrastructure@xxxxxxxxxxxxxxxxxxxxxxx
