Attachment 5431 Details for Bug 32589 – handle_invalid_modules.patch

[patch] handle_invalid_modules.patch

handle_invalid_modules.patch (text/plain), 1.21 KB, created by Arvid Requate on 2013-09-13 11:43:02 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Arvid Requate

Created: 2013-09-13 11:43:02 CEST

Size: 1.21 KB

patch

obsolete

>Index: univention-directory-manager-modules/modules/univention/admin/modules.py
>===================================================================
>--- univention-directory-manager-modules/modules/univention/admin/modules.py	(Revision 43992)
>+++ univention-directory-manager-modules/modules/univention/admin/modules.py	(Arbeitskopie)
>@@ -88,16 +88,19 @@
> 			ud.debug(ud.ADMIN, ud.INFO, 'admin.modules.update: importing "%s"' % p)
> 			parts=p.split(os.path.sep)
> 			mod, name='.'.join(parts), '/'.join(parts)
>-			m=__import__(mod, globals(), locals(), name)
>-			m.initialized=0
>-			modules[m.module]=m
>-			if isContainer(m):
>-				containers.append(m)
>+			try:
>+				m=__import__(mod, globals(), locals(), name)
>+				m.initialized=0
>+				modules[m.module]=m
>+				if isContainer(m):
>+					containers.append(m)
> 
>-			# update the list of superordinates
>-			superordinate = superordinate_name(m)
>-			if superordinate:
>-				superordinates.add(superordinate)
>+				# update the list of superordinates
>+				superordinate = superordinate_name(m)
>+				if superordinate:
>+					superordinates.add(superordinate)
>+			except ImportError, e:
>+				ud.debug(ud.ADMIN, ud.ERROR, 'admin.modules.update: import of "%s" failed: %s' % (p, e))
> 
> 
> 	for p in sys.path:

Actions: View | Diff

Attachments on bug 32589: 5431