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