[Freeipa-devel] [PATCH] 0020..0022 pki-related upgrade fixes

[Martin Basti]

On 29/06/15 16:03, Fraser Tweedale wrote:
> On Thu, Jun 25, 2015 at 11:23:01AM +0200, Martin Basti wrote:
>> On 19/06/15 09:28, Fraser Tweedale wrote:
>>> The attached patches fix upgrade issues when pki is also updated
>> >from pre 10.2.4.
>>> pki dependency is bumped to 10.2.5 - the official builds should be
>>> done Friday (US time) but it is available from my copr[1].  If
>>> someone wants to add to official freeipa COPR in meantime the SRPM
>>> is here[2].
>>>
>>> [1] https://copr.fedoraproject.org/coprs/ftweedal/freeipa/
>>> [2] https://ftweedal.fedorapeople.org/pki-core-10.2.5-0.2.fc21.src.rpm
>>>
>>> Thanks,
>>> Fraser
>>>
>>>
>> Thank you.
>>
>> 1)
>> I cannot apply patches.
>>
> Rebased patches attached.
>
>> 2)
>> IMO patch 0020 was fixed with my patch 266
>>
> It seems we are hitting another case of LDAP disconnection during
> upgrade; without 0020 the upgrade fails.  There might be a better
> way so let me know if you have ideas.
>
>> 3)
>> This print should not be there
>> +
>> +    print cs_cfg
>> +    for profile_id in profile_ids:
>>
> Thakns; removed.
>
>> 4)
>> This is unused variable,  it is defined later
>> +   cs_cfg = None
>>
> Thanks; removed.
>
>> 5)
>> Can you add there log.error or log.debug instead of pass please?
>> +        # enable the profile
>> +        try:
>> +            profile_api.enable_profile(profile_id)
>> +        except errors.RemoteRetrieveError:
>> +            pass
>>
> You've got it.  Also did this a few lines up where the profile is
> disabled.
>
>> I will test it later.
>>
>> -- 
>> Martin Basti
>>
> Thank you,
> Fraser
PATCH 0020 - NACK see my patch 269, it fixes root cause. (IMO with 
reworked patch 21 it is not needed)

PATCH 0021 - NACK, it runs whole upgrade machinery again. Patch how to 
fix it is attached. Sorry I didn't notice it last time.

PATCH 0022 - LGTM


-- 
Martin Basti

-------------- next part --------------
A non-text attachment was scrubbed...
Name: freeipa-mbasti-0000-fix-fraser-ca-schema.patch
Type: text/x-patch
Size: 1852 bytes
Desc: not available
URL: <http://listman.redhat.com/archives/freeipa-devel/attachments/20150629/63209f67/attachment.bin>