View | Details | Raw Unified | Return to bug 38110 | Differences between
and this patch

Collapse All | Expand All

(-)b/management/univention-directory-manager-modules/modules/univention/admin/handlers/__init__.py (-2 / +1 lines)
 Lines 569-576   def __init__(self, co, lo, position, dn='', superordinate=None, attributes=None) Link Here 
569
			try:
569
			try:
570
				self.oldattr = self.lo.get(self.dn, required=True)
570
				self.oldattr = self.lo.get(self.dn, required=True)
571
			except ldap.NO_SUCH_OBJECT:
571
			except ldap.NO_SUCH_OBJECT:
572
				pass
572
				raise univention.admin.uexceptions.noObject(self.dn)
573
#				raise univention.admin.uexceptions.noObject(self.dn)
574
573
575
		if self.oldattr:
574
		if self.oldattr:
576
			self._exists = True
575
			self._exists = True
(-)a/base/univention-system-setup/umc/python/setup/netconf/modules/LdapNetwork.py (-3 / +4 lines)
 Lines 3-9    Link Here 
3
import univention.admin.objects
3
import univention.admin.objects
4
import univention.admin.uldap as uldap
4
import univention.admin.uldap as uldap
5
import univention.admin.modules as modules
5
import univention.admin.modules as modules
6
from univention.admin.uexceptions import base as UniventionBaseException
6
from univention.admin.uexceptions import base as UniventionBaseException, noObject
7
from ldap import LDAPError
7
from ldap import LDAPError
8
8
9
9
 Lines 66-73   def _remove_old_network(self): Link Here 
66
		network_dn = "cn=default,cn=networks,%(ldap/base)s" % self.changeset.ucr
66
		network_dn = "cn=default,cn=networks,%(ldap/base)s" % self.changeset.ucr
67
		network_module = modules.get("networks/network")
67
		network_module = modules.get("networks/network")
68
		modules.init(self.ldap, self.position, network_module)
68
		modules.init(self.ldap, self.position, network_module)
69
		network = univention.admin.objects.get(network_module, None, self.ldap, self.position, network_dn)
69
		try:
70
		if not network.exists():
70
			network = univention.admin.objects.get(network_module, None, self.ldap, self.position, network_dn)
71
		except noObject:
71
			return
72
			return
72
		self.logger.info("Removing '%s'...", network_dn)
73
		self.logger.info("Removing '%s'...", network_dn)
73
		if not self.changeset.no_act:
74
		if not self.changeset.no_act:

Return to bug 38110