Attachment 9174 Details for Bug 34727 – patch

[patch] patch

34727.patch (text/plain), 1.43 KB, created by Florian Best on 2017-09-05 15:25:11 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-09-05 15:25:11 CEST

Size: 1.43 KB

patch

obsolete

>diff --git a/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import b/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import
>index 7813263..f08c2a8 100755
>--- a/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import
>+++ b/ucs-school-import/usr/share/ucs-school-import/scripts/ucs-school-import
>@@ -496,7 +496,13 @@ def object_exists(module, co, lo, scope, superordinate, base, filter, dn):
> 	return None
> 
> 
>-def verify_school_ou(schoolNr, co, lo, baseDN, dcName=None, ShareFileServer=None, displayName=None):
>+def verify_school_ou(schoolNr, co, lo, baseDN):
>+	from ucsschool.lib.models import School
>+	if not School(name=schoolNr).get_udm_object(lo):
>+		raise SystemExit('ERROR: The specified school %r does not exist.' % (schoolNr,))
>+
>+
>+def create_school_ou(schoolNr, co, lo, baseDN, dcName=None, ShareFileServer=None, displayName=None):
> 	global problem_hints
> 
> 	for verified_ou in verified_ous:
>@@ -3261,7 +3267,7 @@ Arguments:
> 			options.displayName = ouname
> 
> 		with stopped_notifier():
>-			verify_school_ou(ouname, co, lo, baseDN, dcName=dcNameEducational, ShareFileServer=options.ShareFileServer, displayName=options.displayName)
>+			create_school_ou(ouname, co, lo, baseDN, dcName=dcNameEducational, ShareFileServer=options.ShareFileServer, displayName=options.displayName)
> 			if dcNameAdministrative:
> 				create_dc(co, lo, baseDN, ouname, dcNameAdministrative, TYPE_DC_ADMINISTRATIVE)
> 		sys.exit(0)

Actions: View | Diff

Attachments on bug 34727: 9174