From a8881721735c570089568f92836c6da3b40a2710 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tobias=20R=C3=BCetschi?= Date: Tue, 7 Jun 2016 14:48:58 +0200 Subject: [PATCH] UCS udm_share: fix creating of new shares --- univention/udm_share.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/univention/udm_share.py b/univention/udm_share.py index a046f3e30d4..deb76742c2c 100644 --- a/univention/udm_share.py +++ b/univention/udm_share.py @@ -271,7 +271,7 @@ def main(): sambaMSDFSRoot = dict(type='str', default='0'), sambaName = dict(type='str', - default=''), + default=None), sambaNtAclSupport = dict(type='str', default='1'), sambaOplocks = dict(type='str', @@ -329,15 +329,18 @@ def main(): obj[k] = module.params[k] diff = obj.diff() - for k in obj.keys(): - if obj.hasChanged(k): - changed=True + if exists: + for k in obj.keys(): + if obj.hasChanged(k): + changed=True + else: + changed=True if not module.check_mode: if not exists: obj.create() elif changed: obj.modify() - except BaseException as e: + except Exception as e: module.fail_json( msg='Creating/editing share {} in {} failed: {}'.format(name, container, e) )