On 06/25/2014 04:01 PM, Tomas Babej wrote:
>
> On 06/25/2014 10:48 AM, Petr Viktorin wrote:
>> On 06/19/2014 03:52 PM, Tomas Babej wrote:
>>>
>>> On 06/19/2014 12:52 PM, Tomas Babej wrote:
>>>> On 06/18/2014 10:52 AM, Petr Viktorin wrote:
>>>>> On 06/17/2014 02:15 PM, Tomas Babej wrote:
>>>>>> On 06/17/2014 12:03 PM, Timo Aaltonen wrote:
>>>>>>> On 17.06.2014 11:16, Martin Kosek wrote:
>>>>>> Attached is a new version of patch 226, and a new patch 228,
>>>>>> which moves
>>>>>> the paths from installers to the paths module.
>>>>> In patch 226, there's another "certificated" typo in
>>>>> remove_ca_cert_from_systemwide_ca_store
>>>>>
>>>>>> I greped the repository, and I do not see many paths lurking
>>>>>> around any
>>>>>> more, there are only some in the error messages (as these can't be
>>>>>> reliably replaced automatically, and will need some manual love).
>>>>>>
>>>>>> If you see any forgotten paths, which should be added to the
>>>>>> module, let
>>>>>> me know.
>>
>> Well, since you asked...
>>
>> install/tools/ipa-upgradeconfig:236:
>> ipautil.run([paths.PKI_SETUP_PROXY, '-pki_instance_root=/var/lib'
>> ipaserver/install/cainstance.py:1330: "-pki_instance_root=/var/lib",
>>
>> ipaserver/install/dsinstance.py:209:InstallLdifFile=
>> /var/lib/dirsrv/boot.ldif
>> ipaserver/install/dsinstance.py:210:inst_dir=
>> /var/lib/dirsrv/scripts-$SERVERID
>>
>> ipaserver/install/ipa_backup.py:464: '--exclude=/var/lib/ipa/backup',
>>
>> ipatests/test_integration/tasks.py:451:    host.run_command("find
>> /var/lib/sss/db -name '*.ldb' | "
>>
>> install/tools/ipa-replica-conncheck:403:
>> "/usr/sbin/ipa-replica-conncheck " +
>> install/tools/ipa-replica-conncheck:414:
>> print_info("/usr/sbin/ipa-replica-conncheck " + "
>> ".join(remote_check_opts))
>>
>> ipapython/ipautil.py:296:        env["PATH"] =
>> "/bin:/sbin:/usr/kerberos/bin:/usr/kerberos/sbin:/usr/bin:/usr/sbin"
>>
>> ipaserver/install/cainstance.py:88:ConfigFile =
>> /usr/share/pki/ca/conf/database.ldif
>>
>> ipaserver/install/bindinstance.py:829:
>> ipautil.run(['/usr/libexec/generate-rndc-key.sh'])
>>
>
> /me will think twice about teasing nex time.
>
> This are paths requiring manual changes in one way or the other and as
> such cannot be handled by my tool. Let's not stall the patcheset on
> this. We can fix these (and surely there are other) as we go along.
>
>>
>> I guess it'll be a while before we catch them all, but now it's at
>> least clear where these paths should be, so anyone porting to another
>> distro can send patches (or tickets) upstream.
>>
>>>>> I see another duplicate:
>>>>>      SSS_KRB5_INCLUDE_D = "/var/lib/sss/pubconf/krb5.include.d"
>>>>>      SSSD_PUBCONF_KRB5_INCLUDE_D_DIR =
>>>>> "/var/lib/sss/pubconf/krb5.include.d/"
>>
>> Could you just pick one instead? Would ipa_backup.py break if it had
>> a trailing slash here?
>>
>
> Yes. I verified it produces the same result with or without trailing
> slash, fixed.
>
>
>> In ipa-client-install, if you set:
>>     NSSWITCH_CONF = paths.NSSWITCH_CONF
>> then you should only use one of those later. (Preferably paths.*, to
>> get rid of the redundant constants.)
>> Perhaps this is for another patch that would clean up all the cases
>> where these trivial module variables are used.
>>
>
> I agree. Fixed this occurence.
>
>>>> Fixed all mentioned issues. I also attached a patch 230, which removes
>>>> the base Authconfig class.
>>
>>
>>> Attaching one additional patch, which removes unnecessary build
>>> warnings.
>>>
>>
>> 226, 230, 231 look good
>>
>
> Attaching whole updated patchset.

Attaching one more patch which should fix broken CI tests.

>
> -- 
> Tomas Babej
> Associate Software Engineer | Red Hat | Identity Management
> RHCE | Brno Site | IRC: tbabej | freeipa.org 
>
>
> _______________________________________________
> Freeipa-devel mailing list
> Freeipa-devel@redhat.com
> https://www.redhat.com/mailman/listinfo/freeipa-devel

-- 
Tomas Babej
Associate Software Engineer | Red Hat | Identity Management
RHCE | Brno Site | IRC: tbabej | freeipa.org 

>From 2fda5e386b9fdf75b6c02fbeedafaeb001d80a74 Mon Sep 17 00:00:00 2001
From: Tomas Babej <tba...@redhat.com>
Date: Wed, 25 Jun 2014 16:12:19 +0200
Subject: [PATCH] ipaplatform: Fix misspelled path constant

---
 ipatests/test_integration/tasks.py       | 2 +-
 ipatests/test_integration/test_caless.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipatests/test_integration/tasks.py b/ipatests/test_integration/tasks.py
index ccb0d8693a1e89d95bbeb4c75fc263d0f689cb36..cd8f98306030f46c099a08ca1a558fd10807bfa9 100644
--- a/ipatests/test_integration/tasks.py
+++ b/ipatests/test_integration/tasks.py
@@ -219,7 +219,7 @@ def install_replica(master, replica, setup_ca=True):
                         '--ip-address', replica.ip,
                         replica.hostname])
     replica_bundle = master.get_file_contents(
-        paths.REPLICA_INFO_TEMPLATE_GPG % replica.hostname)
+        paths.REPLICA_INFO_GPG_TEMPLATE % replica.hostname)
     replica_filename = os.path.join(replica.config.test_dir,
                                     'replica-info.gpg')
     replica.put_file_contents(replica_filename, replica_bundle)
diff --git a/ipatests/test_integration/test_caless.py b/ipatests/test_integration/test_caless.py
index d5382988b0674f7e96d48a53050100e2bb444ae9..28bfae5a239d0e134b83122c059a22674f0f4eca 100644
--- a/ipatests/test_integration/test_caless.py
+++ b/ipatests/test_integration/test_caless.py
@@ -245,7 +245,7 @@ class CALessBase(IntegrationTest):
 
         if result.returncode == 0:
             replica_bundle = master.get_file_contents(
-                paths.REPLICA_INFO_TEMPLATE_GPG % replica.hostname)
+                paths.REPLICA_INFO_GPG_TEMPLATE % replica.hostname)
             replica.put_file_contents(self.get_replica_filename(replica),
                                       replica_bundle)
         else:
-- 
1.9.3

_______________________________________________
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Reply via email to