Re: [gentoo-portage-dev] [PATCH][v3] enable user settable gpg keyservers (attached)

[Matthew Thode <prometheanfire@gentoo.org>]

[-- Attachment #1: Type: text/plain, Size: 2329 bytes --]

On 19-02-26 10:52:52, Zac Medico wrote:
> On 2/26/19 10:48 AM, Zac Medico wrote:
> > On 2/25/19 1:45 PM, Matthew Thode wrote:
> >> On 19-02-25 15:41:03, Matthew Thode wrote:
> >>> On 19-02-25 14:34:46, Matthew Thode wrote:
> >>>> Allowing users to define which keyservers they update from allows them
> >>>> to work around buggy keyservers.  It is also useful for local mirrors
> >>>> and / or private keyservers.
> >>>>
> >>>> It's likely that I'm setting the default incorrectly and not
> >>>> alphabetizing right, but the code works at least...
> >>>>
> >>>
> >>> Ok, let's try that again, should be cleaner/better/etc
> >>>
> >>
> >> v3, attached
> >>
> >> ---
> > 
> >>  lib/portage/repository/config.py | 6 ++++++
> >>  lib/portage/sync/syncbase.py     | 6 +++---
> >>  2 files changed, 9 insertions(+), 3 deletions(-)
> >>
> >> diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py
> >> index 482711c4b..235371ce5 100644
> >> --- a/lib/portage/repository/config.py
> >> +++ b/lib/portage/repository/config.py
> >> @@ -109,6 +109,7 @@ class RepoConfig(object):
> >>  		'sync_allow_hardlinks',
> >>  		'sync_depth',
> >>  		'sync_hooks_only_on_change',
> >> +		'sync_openpgp_keyserver',
> >>  		'sync_openpgp_key_path',
> >>  		'sync_openpgp_key_refresh_retry_count',
> >>  		'sync_openpgp_key_refresh_retry_delay_exp_base',
> >> @@ -224,6 +225,9 @@ class RepoConfig(object):
> >>  		self.sync_allow_hardlinks = repo_opts.get(
> >>  			'sync-allow-hardlinks', 'true').lower() in ('true', 'yes')
> >>  
> >> +		self.sync_openpgp_keyserver = repo_opts.get(
> >> +			'sync-openpgp-keyserver', 'hkps.pool.sks-keyservers.net').strip.lower()
> > 
> > It needs to be like this:
> > 
> > +			'sync-openpgp-keyserver', 'hkps.pool.sks-keyservers.net').strip().lower() or None
> > 
> > because gemato handles None but not empty strings.
> 
> Also let's not provide a default keyserver, let gemato handle that.
> 
> Also please update man/portage.5.
> 

Ok, that stanza no reads:

self.sync_openpgp_keyserver = repo_opts.get(
        'sync-openpgp-keyserver').strip.lower() or None

I didn't see a section for the sync-openpgp options though, let me know
anything else or I'll send the updated patch tonight.

-- 
Matthew Thode (prometheanfire)

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]