This is an automated email from the git hooks/post-receive script.
firstyear pushed a commit to branch master
in repository 389-ds-base.
commit e9eff97ca2315f2f01854d0387d9599a1330fb16
Author: Thierry bordaz (tbordaz) <tbordaz(a)redhat.com>
Date: Fri Dec 20 12:21:30 2013 +0100
Fix for running on RPM (not -- prefix)
Reviewed by: Nathan Kinder (thanks Nathan)
---
src/lib389/lib389/__init__.py | 18 +++++++++++-------
1 file changed, 11 insertions(+), 7 deletions(-)
diff --git a/src/lib389/lib389/__init__.py b/src/lib389/lib389/__init__.py
index d55763f..40a0e75 100644
--- a/src/lib389/lib389/__init__.py
+++ b/src/lib389/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)
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.