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