Attachment 9260 Details for Bug 45586 – patch

[patch] patch

45586.patch (text/plain), 2.13 KB, created by Florian Best on 2017-10-24 15:34:57 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-10-24 15:34:57 CEST

Size: 2.13 KB

patch

obsolete

>commit 66fc9488eccbdbef5c40a47a4d48b9fe9b79bdbd
>Author: Florian Best <best@univention.de>
>Date:   Tue Oct 24 15:34:25 2017 +0200
>
>    Bug #45586: fix joinscript on memberserver
>
>diff --git a/services/univention-printserver/mark_models_as_deprecated.py b/services/univention-printserver/mark_models_as_deprecated.py
>index 32aa21e..524d80e 100755
>--- a/services/univention-printserver/mark_models_as_deprecated.py
>+++ b/services/univention-printserver/mark_models_as_deprecated.py
>@@ -38,6 +38,7 @@
> import univention.admin.config
> import univention.admin.uldap
> 
>+
> class UpdatePrinterModels(object):
> 
> 	def __init__(self, options, obsolete):
>@@ -51,7 +52,6 @@ def __init__(self, options, obsolete):
> 		univention.admin.modules.init(self.lo, self.position, self.models)
> 
> 	def ldap_connection(self):
>-		self.co = univention.admin.config.config()
> 		if self.options.binddn and self.options.bindpwd:
> 			self.lo = univention.admin.uldap.access(
> 				host=self.ucr['ldap/master'],
>@@ -87,7 +87,6 @@ def check_duplicates(self):
> 			ldap_models = attr.get('printerModel', [])
> 			new_ldap_models = list()
> 			ppds = dict()
>-			change = False
> 			for model in ldap_models:
> 				ppd = model.split('"')[1]
> 				if ppd in ppds:
>@@ -96,7 +95,7 @@ def check_duplicates(self):
> 					ppds[ppd] = [model]
> 			for ppd in ppds:
> 				if len(ppds[ppd]) > 1:
>-					_tmp, new_description =self.get_description_from_ppd(ppd)
>+					_tmp, new_description = self.get_description_from_ppd(ppd)
> 					new_ldap_models.append('"%s" "%s"' % (ppd, new_description))
> 				else:
> 					new_ldap_models.append(ppds[ppd][0])
>@@ -110,7 +109,7 @@ def check_duplicates(self):
> 					self.lo.modify(dn, changes)
> 
> 	def mark_as_obsolete(self):
>-		obj = self.models.lookup(self.co, self.lo, ldap.filter.filter_format('name=%s', [options.name]))
>+		obj = self.models.lookup(None, self.lo, ldap.filter.filter_format('name=%s', [options.name]))
> 		if obj:
> 			obj = obj[0]
> 			obj.open()
>@@ -134,6 +133,7 @@ def mark_as_obsolete(self):
> 				if options.verbose:
> 					print 'info: %s modified' % obj.dn
> 
>+
> if __name__ == '__main__':
> 	usage = '%prog [options] [MODEL, MODEL, ...]'
> 	parser = optparse.OptionParser(usage=usage)

Actions: View | Diff

Attachments on bug 45586: 9259 | 9260