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