Attachment 4183 Details for Bug 25174 – Patch

[patch] Patch

patch.diff (text/plain), 1.33 KB, created by Lukas Walter on 2012-02-15 17:48:24 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Lukas Walter

Created: 2012-02-15 17:48:24 CET

Size: 1.33 KB

patch

obsolete

>Index: modules/univention/admincli/admin.py
>===================================================================
>--- modules/univention/admincli/admin.py	(Revision 30941)
>+++ modules/univention/admincli/admin.py	(Arbeitskopie)
>@@ -31,7 +31,7 @@
> # <http://www.gnu.org/licenses/>.
> 
> 
>-import sys, getopt, types, re, codecs, string, time, base64, os, subprocess
>+import sys, getopt, types, re, codecs, string, time, base64, os, subprocess, ldap
> 
> import univention.debug
> 
>@@ -878,6 +878,9 @@
> 		except univention.admin.uexceptions.noObject:
> 			out.append('E: object not found')
> 			return out + ["OPERATION FAILED"]
>+		except ldap.NO_SUCH_OBJECT:
>+			out.append('E: object not found: %s' % dn)
>+			return out + ['OPERATION FAILED']
> 
> 		object.open()
> 		if hasattr(object,'open_warning') and object.open_warning:
>Index: modules/univention/admin/handlers/__init__.py
>===================================================================
>--- modules/univention/admin/handlers/__init__.py	(Revision 30941)
>+++ modules/univention/admin/handlers/__init__.py	(Arbeitskopie)
>@@ -482,7 +482,7 @@
> 		if attributes:
> 			self.oldattr = attributes
> 		else:
>-			self.oldattr=self.lo.get(self.dn)
>+			self.oldattr=self.lo.get(dn=self.dn, attr=[], required=True)
> 		if self.oldattr:
> 			self._exists = True
> 			oldinfo=univention.admin.mapping.mapDict(self.mapping, self.oldattr)

Actions: View | Diff

Attachments on bug 25174: 4183