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 72bff95eeaaae8bd8288d128038c6885519e300b
Author: William Brown <firstyear(a)redhat.com>
Date: Tue Dec 5 11:52:49 2017 +0100
Ticket 49484 - Minor cli tool fixes.
Bug Description: Some commands stopped working.
Fix Description: Minor fixes to backend class, initialise
and setup to work in more cases correctly.
https://pagure.io/389-ds-base/issue/49484
Author: wibrown
Review by: spichugi (Thanks)
---
src/lib389/lib389/backend.py | 4 +++-
src/lib389/lib389/cli_idm/initialise.py | 1 +
src/lib389/lib389/instance/setup.py | 1 +
3 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/lib389/lib389/backend.py b/src/lib389/lib389/backend.py
index 7a26513..25a244c 100644
--- a/src/lib389/lib389/backend.py
+++ b/src/lib389/lib389/backend.py
@@ -568,7 +568,9 @@ class Backends(DSLdapObjects):
:type instance: lib389.DirSrv
"""
- def __init__(self, instance):
+ def __init__(self, instance, basedn=None):
+ # Basedn has to be here, despite not being used to satisfy
+ # cli_base _generic_create.
super(Backends, self).__init__(instance=instance)
self._objectclasses = [BACKEND_OBJECTCLASS_VALUE]
self._filterattrs = ['cn', 'nsslapd-suffix',
'nsslapd-directory']
diff --git a/src/lib389/lib389/cli_idm/initialise.py
b/src/lib389/lib389/cli_idm/initialise.py
index b9240d2..26ae02d 100644
--- a/src/lib389/lib389/cli_idm/initialise.py
+++ b/src/lib389/lib389/cli_idm/initialise.py
@@ -11,6 +11,7 @@ from lib389.configurations import get_sample_entries
def initialise(inst, basedn, log, args):
sample_entries = get_sample_entries(args.version)
+ assert basedn is not None
s_ent = sample_entries(inst, basedn)
s_ent.apply()
diff --git a/src/lib389/lib389/instance/setup.py b/src/lib389/lib389/instance/setup.py
index 965c499..90929dd 100644
--- a/src/lib389/lib389/instance/setup.py
+++ b/src/lib389/lib389/instance/setup.py
@@ -15,6 +15,7 @@ import grp
import re
import socket
import subprocess
+import getpass
from lib389 import _ds_shutil_copytree
from lib389._constants import *
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.