From b0097ea0a5fbb59570b7553315c3a04935a1e8f8 Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 29 Jan 2015 21:35:33 +0100 Subject: [PATCH 1/3] change order of LDAP commands and logging to fix log messages --- gvaldap/ldaptasks/tasks.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gvaldap/ldaptasks/tasks.py b/gvaldap/ldaptasks/tasks.py index f17a7e6..05c2da8 100644 --- a/gvaldap/ldaptasks/tasks.py +++ b/gvaldap/ldaptasks/tasks.py @@ -97,6 +97,8 @@ def create_ldap_user(username, uid, gid, gecos, homedir, shell, password): if password is not None: ldapuser.set_password(password) _LOGGER.info('set password for LDAP user %s', ldapuser.dn) + ldapuser.save() + _LOGGER.info('LDAP user %s created', ldapuser.dn) if ldapuser.username in ldapgroup.members: _LOGGER.info( 'LDAP user %s is already member of LDAP group %s', @@ -107,8 +109,6 @@ def create_ldap_user(username, uid, gid, gecos, homedir, shell, password): _LOGGER.info( 'LDAP user %s has been added to LDAP group %s', ldapuser.dn, ldapgroup.dn) - ldapuser.save() - _LOGGER.info('LDAP user %s created', ldapuser.dn) return ldapuser.dn From fad70cf74a08df7c1274af13ab33f9227dad576b Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 29 Jan 2015 21:50:23 +0100 Subject: [PATCH 2/3] add changelog entry --- docs/changelog.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/docs/changelog.rst b/docs/changelog.rst index 5805c8c..a4a707d 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,8 @@ Changelog ========= +* :bug:`-` fix minor log message issue + * :release:`0.5.1 <2015-01-29>` * :bug:`-` reverted Reject handling in ldaptasks From 261ffe5bb0e2009c487babfd3e2ee7a0d1c1d94a Mon Sep 17 00:00:00 2001 From: Jan Dittberner Date: Thu, 29 Jan 2015 21:51:25 +0100 Subject: [PATCH 3/3] update docs version, add release to changelog --- docs/changelog.rst | 1 + docs/conf.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/docs/changelog.rst b/docs/changelog.rst index a4a707d..5e48338 100644 --- a/docs/changelog.rst +++ b/docs/changelog.rst @@ -1,6 +1,7 @@ Changelog ========= +* :release:`0.5.2 <2015-01-29>` * :bug:`-` fix minor log message issue * :release:`0.5.1 <2015-01-29>` diff --git a/docs/conf.py b/docs/conf.py index 03dd15f..b2d2cf9 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -62,7 +62,7 @@ copyright = u'2014, 2015 Jan Dittberner' # The short X.Y version. version = '0.5' # The full version, including alpha/beta/rc tags. -release = '0.5.1' +release = '0.5.2' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages.