[Freeipa-devel] [PATCH 0029] Move user/group constants for PKI and DS into ipaplatform

[Martin Basti]

On 22.03.2016 10:43, Martin Basti wrote:
>
>
> On 18.03.2016 11:53, Christian Heimes wrote:
>> On 2016-03-18 10:22, Martin Basti wrote:
>>>
>>> On 29.02.2016 16:02, David Kupka wrote:
>>>> Hello Christian,
>>>> sorry for letting this patch rot for so long. I've forget about it 
>>>> the minute Fraser replied.
>>>> To compensate a little I've fixed pep8 error, rebased it and 
>>>> attaching two versions for master and for 4.3 branch.
>>>> I haven't found any missing cases and it works for me. If you're OK 
>>>> with the modified patches it can be pushed.
>>>>
>>>> David
>>>>
>>>> ----- Original Message -----
>>>> From: "Christian Heimes" <cheimes at redhat.com>
>>>> To: "Fraser Tweedale" <ftweedal at redhat.com>
>>>> Cc: "freeipa-devel" <freeipa-devel at redhat.com>
>>>> Sent: Wednesday, January 20, 2016 11:57:42 AM
>>>> Subject: Re: [Freeipa-devel] [PATCH 0029] Move user/group constants 
>>>> for PKI and DS into ipaplatform
>>>>
>>>> On 2016-01-20 02:54, Fraser Tweedale wrote:
>>>>> On Tue, Jan 19, 2016 at 02:20:27PM +0100, Christian Heimes wrote:
>>>>>> ipaplatform.constants has platform specific names for a couple of 
>>>>>> system
>>>>>> users like Apache HTTPD. The user names for PKI_USER, PKI_GROUP, 
>>>>>> DS_USER
>>>>>> and DS_GROUP are defined in other modules. Similar to #5587 the 
>>>>>> patch my
>>>>>> patch moves the constants into the platform module.
>>>>>>
>>>>>> https://fedorahosted.org/freeipa/ticket/5619
>>>>> I see a few remaining cases:
>>>>>
>>>>> ipaserver/install/dsinstance.py
>>>>> 712:        pent = pwd.getpwnam("dirsrv")
>>>>>
>>>>> ipatests/test_integration/test_backup_and_restore.py
>>>>> 167:            self.master.run_command(['userdel', 'dirsrv'])
>>>>> 168:            self.master.run_command(['userdel', 'pkiuser'])
>>>>>
>>>>> ipaplatform/redhat/tasks.py
>>>>> 441:        if name == 'pkiuser':
>>>>>
>>>>> When these are included, ACK.
>>>> Good catch!
>>>>
>>>> My new patch takes care of remaining cases.
>>>>
>>>>
>>>>
>>>>
>>> Christian do you agree with proposed changes, can we push it?
>>> Martin^2
>> Oh, the patch is still open? ACK!
>>
>>
> Pushed to ipa-4-3: e3bf65f2df9c50873f0967b96a6a2a5975a87f79
> Pushed to master: 49be6c8d3cc20902dbe8e92a74e31aed2fd21d9f
>
too-late-NACK

This patch broke ipa-restore.

please not that 2 modules are imported as same name in ipa_restore.py
from ipalib import api, errors, constants
from ipaplatform.constants import constants

2016-03-22T16:56:27Z DEBUG   File 
"/usr/lib/python2.7/site-packages/ipapython/admintool.py", line 171, in 
execute
     return_value = self.run()
   File 
"/usr/lib/python2.7/site-packages/ipaserver/install/ipa_restore.py", 
line 218, in run
     self.backup_dir, constants.FQDN)

Martin^2