1 |
On 19-02-26 10:52:52, Zac Medico wrote: |
2 |
> On 2/26/19 10:48 AM, Zac Medico wrote: |
3 |
> > On 2/25/19 1:45 PM, Matthew Thode wrote: |
4 |
> >> On 19-02-25 15:41:03, Matthew Thode wrote: |
5 |
> >>> On 19-02-25 14:34:46, Matthew Thode wrote: |
6 |
> >>>> Allowing users to define which keyservers they update from allows them |
7 |
> >>>> to work around buggy keyservers. It is also useful for local mirrors |
8 |
> >>>> and / or private keyservers. |
9 |
> >>>> |
10 |
> >>>> It's likely that I'm setting the default incorrectly and not |
11 |
> >>>> alphabetizing right, but the code works at least... |
12 |
> >>>> |
13 |
> >>> |
14 |
> >>> Ok, let's try that again, should be cleaner/better/etc |
15 |
> >>> |
16 |
> >> |
17 |
> >> v3, attached |
18 |
> >> |
19 |
> >> --- |
20 |
> > |
21 |
> >> lib/portage/repository/config.py | 6 ++++++ |
22 |
> >> lib/portage/sync/syncbase.py | 6 +++--- |
23 |
> >> 2 files changed, 9 insertions(+), 3 deletions(-) |
24 |
> >> |
25 |
> >> diff --git a/lib/portage/repository/config.py b/lib/portage/repository/config.py |
26 |
> >> index 482711c4b..235371ce5 100644 |
27 |
> >> --- a/lib/portage/repository/config.py |
28 |
> >> +++ b/lib/portage/repository/config.py |
29 |
> >> @@ -109,6 +109,7 @@ class RepoConfig(object): |
30 |
> >> 'sync_allow_hardlinks', |
31 |
> >> 'sync_depth', |
32 |
> >> 'sync_hooks_only_on_change', |
33 |
> >> + 'sync_openpgp_keyserver', |
34 |
> >> 'sync_openpgp_key_path', |
35 |
> >> 'sync_openpgp_key_refresh_retry_count', |
36 |
> >> 'sync_openpgp_key_refresh_retry_delay_exp_base', |
37 |
> >> @@ -224,6 +225,9 @@ class RepoConfig(object): |
38 |
> >> self.sync_allow_hardlinks = repo_opts.get( |
39 |
> >> 'sync-allow-hardlinks', 'true').lower() in ('true', 'yes') |
40 |
> >> |
41 |
> >> + self.sync_openpgp_keyserver = repo_opts.get( |
42 |
> >> + 'sync-openpgp-keyserver', 'hkps.pool.sks-keyservers.net').strip.lower() |
43 |
> > |
44 |
> > It needs to be like this: |
45 |
> > |
46 |
> > + 'sync-openpgp-keyserver', 'hkps.pool.sks-keyservers.net').strip().lower() or None |
47 |
> > |
48 |
> > because gemato handles None but not empty strings. |
49 |
> |
50 |
> Also let's not provide a default keyserver, let gemato handle that. |
51 |
> |
52 |
> Also please update man/portage.5. |
53 |
> |
54 |
|
55 |
Ok, that stanza no reads: |
56 |
|
57 |
self.sync_openpgp_keyserver = repo_opts.get( |
58 |
'sync-openpgp-keyserver').strip.lower() or None |
59 |
|
60 |
I didn't see a section for the sync-openpgp options though, let me know |
61 |
anything else or I'll send the updated patch tonight. |
62 |
|
63 |
-- |
64 |
Matthew Thode (prometheanfire) |