Attachment 7740 Details for Bug 41172 – patch

[patch] patch

41172.patch (text/plain), 1.21 KB, created by Florian Best on 2016-06-14 11:47:17 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2016-06-14 11:47:17 CEST

Size: 1.21 KB

patch

obsolete

>diff --git a/management/univention-directory-manager-modules/modules/univention/admincli/admin.py b/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
>index c304962..7adfc49 100755
>--- a/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
>+++ b/management/univention-directory-manager-modules/modules/univention/admincli/admin.py
>@@ -669,18 +669,19 @@ def _doit(arglist):
> 			else:
> 				name=val[:pos]
> 				value = _2utf8( val[ pos + 1 : ] )
>-			was_set=0
>+			was_set = False
> 			for mod, (properties,options) in information.items():
> 				if properties.has_key(name):
>+					was_set = True
> 					if properties[name].multivalue:
>-						if not remove.has_key(name):
>-							remove[name]=[]
>-						if value:
>-							remove[name].append(value)
>-							was_set=1
>+						if value is None:
>+							remove[name] = value
>+						elif value:
>+							remove.setdefault(name, [])
>+							if remove[name] is not None:
>+								remove[name].append(value)
> 					else:
>-						remove[name]=value
>-						was_set=1
>+						remove[name] = value
> 			if not was_set:
> 				out.append("WARNING: No attribute with name %s in this module, value not removed."%name)
> 		elif opt == '--remove_referring':

Actions: View | Diff

Attachments on bug 41172: 7633 | 7669 | 7740