From c803d3867317e17137100ec2c22a180cd76c1044 Mon Sep 17 00:00:00 2001 From: "Thierry bordaz (tbordaz)" Date: Fri, 20 Dec 2013 12:21:30 +0100 Subject: [PATCH 1/2] Fix for running on RPM (not -- prefix) --- lib389/__init__.py | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lib389/__init__.py b/lib389/__init__.py index d55763f..40a0e75 100644 --- a/lib389/__init__.py +++ b/lib389/__init__.py @@ -571,12 +571,15 @@ class DirSrv(SimpleLDAPObject): # privconfig_head and sysconfig_head # first check the private repository - pattern = "%s*" % os.path.join(privconfig_head, DEFAULT_ENV_HEAD) - found = search_dir(instances, pattern, self.serverid) - if found: - assert len(instances) == 1 + if privconfig_head: + pattern = "%s*" % os.path.join(privconfig_head, DEFAULT_ENV_HEAD) + found = search_dir(instances, pattern, self.serverid) + if found: + assert len(instances) == 1 + else: + assert len(instances) == 0 else: - assert len(instances) == 0 + found = False # second, if not already found, search the system repository if not found: @@ -585,8 +588,9 @@ class DirSrv(SimpleLDAPObject): else: # all instances must be retrieved - pattern = "%s*" % os.path.join(privconfig_head, DEFAULT_ENV_HEAD) - search_dir(instances, pattern) + if privconfig_head: + pattern = "%s*" % os.path.join(privconfig_head, DEFAULT_ENV_HEAD) + search_dir(instances, pattern) pattern = "%s*" % os.path.join(sysconfig_head, DEFAULT_ENV_HEAD) search_dir(instances, pattern) -- 1.7.11.7