Attachment 5726 Details for Bug 33610

[patch] Hide releases > policy release

bug33610.patch (text/plain), 4.27 KB, created by Dirk Wiesenthal on 2014-01-09 22:49 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Dirk Wiesenthal

Created: 2014-01-09 22:49 CET

Size: 4.27 KB

patch

obsolete

>Index: debian/control
>===================================================================
>--- debian/control	(Revision 47007)
>+++ debian/control	(Revision 47011)
>@@ -14,6 +14,7 @@
> Depends: ${misc:Depends}, ${python:Depends},
>  univention-config-registry,
>  univention-directory-policy,
>+ univention-policy-tools,
>  netcat,
>  wget,
>  apt-mirror,
>Index: modules/univention/updater/tools.py
>===================================================================
>--- modules/univention/updater/tools.py	(Revision 47007)
>+++ modules/univention/updater/tools.py	(Revision 47011)
>@@ -4,7 +4,7 @@
> # Univention Management Console
> #  module: manages updates
> #
>-# Copyright 2008-2013 Univention GmbH
>+# Copyright 2008-2014 Univention GmbH
> #
> # http://www.univention.de/
> #
>@@ -35,6 +35,7 @@
> 	import univention.debug as ud
> except ImportError:
> 	import univention.debug2 as ud
>+from univention.lib.policy_result import policy_result
> 
> # TODO: Convert to absolute imports only AFTER the unit test has been adopted
> from commands import cmd_update, cmd_dist_upgrade_sim, cmd_dist_upgrade
>@@ -49,11 +50,9 @@
> import httplib
> import socket
> import univention.config_registry
>-import traceback
> import urllib2
> from urllib import quote
> import subprocess
>-from operator import attrgetter, itemgetter
> import new
> import tempfile
> import shutil
>@@ -160,6 +159,9 @@
> 			raise ValueError( 'string does not match UCS version pattern' )
> 		self.major, self.minor, self.patchlevel = map(int, match.groups())
> 
>+	def to_dict(self):
>+		return {'major' : self.major, 'minor' : self.minor, 'patchlevel' : self.patchlevel}
>+
> 	def __getitem__(self, k):
> 		'''Dual natured dictionary: retrieve value from attribute.'''
> 		return self.__dict__[k]
>@@ -554,6 +556,7 @@
> 		self.architectures = [ os.popen('dpkg --print-architecture 2>/dev/null').readline()[:-1] ]
> 
> 		self.ucr_reinit()
>+		self._policy_limit = None
> 
> 	def config_repository( self ):
> 		'''Retrieve configuration to access repository. Overridden in UniventionMirror.'''
>@@ -568,6 +571,7 @@
> 		'''Re-initialize settings'''
> 		self.configRegistry=univention.config_registry.ConfigRegistry()
> 		self.configRegistry.load()
>+		self._policy_limit = None
> 
> 		self.is_repository_server = self.configRegistry.is_true('local/repository', False)
> 
>@@ -628,6 +632,28 @@
> 				self.log.exception('Failed server detection: %s' % (e,))
> 				raise
> 
>+	def _get_policy_limit(self):
>+		if self._policy_limit is None:
>+			ucs_version = UCS_Version((100, 100, 100))
>+			try:
>+				result, policies = policy_result(self.configRegistry['ldap/hostdn'])
>+			except Exception as e:
>+				ud.debug(ud.NETWORK, ud.WARN, str(e))
>+			else:
>+				try:
>+					active = result['univentionUpdateActivate'][0]
>+					version = result['univentionUpdateVersion'][0]
>+				except (KeyError, IndexError):
>+					pass
>+				else:
>+					if active == 'TRUE':
>+						try:
>+							ucs_version = UCS_Version(version)
>+						except (ValueError, TypeError):
>+							ud.debug(ud.NETWORK, ud.WARN, 'Unable to parse univentionUpdateVersion %s' % version)
>+			self._policy_limit = ucs_version
>+		return self._policy_limit
>+
> 	def get_next_version(self, version, components=[], errorsto='stderr'):
> 		'''Check if a new patchlevel, minor or major release is available for the given version.
> 		   Components must be available for the same major.minor version.
>@@ -637,12 +663,19 @@
> 
> 		def versions(major, minor, patchlevel):
> 			"""Generate next valid version numbers as hash."""
>+			next_versions = []
>+			policy_limit = self._get_policy_limit()
> 			if patchlevel < 99:
>-				yield {'major':major,   'minor':minor,   'patchlevel':patchlevel+1}
>+				next_versions.append(UCS_Version((major, minor, patchlevel + 1)))
> 			if minor < 99:
>-				yield {'major':major,   'minor':minor+1, 'patchlevel':0}
>+				next_versions.append(UCS_Version((major, minor + 1, 0)))
> 			if major < 99:
>-				yield {'major':major+1, 'minor':0,       'patchlevel':0}
>+				next_versions.append(UCS_Version((major + 1, 0, 0)))
>+			for next_version in next_versions:
>+				if next_version <= policy_limit:
>+					yield next_version.to_dict()
>+				else:
>+					ud.debug(ud.NETWORK, ud.PROCESS, '%s not used because Policy only allows releases up to %s' % (next_version, policy_limit))
> 
> 		for ver in versions(version.major, version.minor, version.patchlevel):
> 			repo = UCSRepoPool(prefix=self.server, part='maintained', **ver)

Actions: View | Diff

Attachments on bug 33610: 5726