Attachment 4377 Details for Bug 27098

[patch] bug_27098_v2.patch

bug_27098_v2.patch (text/plain), 1.63 KB, created by Stefan Gohmann on 2012-05-15 22:13 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Gohmann

Created: 2012-05-15 22:13 CEST

Size: 1.63 KB

patch

obsolete

>Index: modules/univention/updater/tools.py
>===================================================================
>--- modules/univention/updater/tools.py	(revision 32963)
>+++ modules/univention/updater/tools.py	(working copy)
>@@ -1382,15 +1382,30 @@
> 		repo = UCSRepoPool(prefix=server, patch=component)
> 		for repo.version in versions_mm:
> 			for repo.part in ["%s/component" % part for part in parts]:
>-				path = '%(version)s/%(part)s/%(patch)s/Packages.gz' % repo
>-				try:
>-					assert server.access(path)
>-					result.append('deb %(prefix)s%(version)s/%(part)s/%(patch)s/ ./' % repo)
>-					if cleanComponent:
>-						result.append('clean %(prefix)s%(version)s/%(part)s/%(patch)s/' % repo)
>-				except DownloadError, e:
>-					ud.debug(ud.NETWORK, ud.ALL, "%s" % e)
>+				errata_prefixes = ['']
>+				if iterate_errata:
>+					if errata_level:
>+						errata_prefixes = ['-errata%s' % errata_level]
>+					else:
>+						errata_level = int(self.configRegistry.get('repository/online/component/%s/%s/erratalevel' % (component, repo.version), 0))
>+						errata_prefixes += ['-errata%d' % x for x in range(1, errata_level + 1)]
>+				for ep in errata_prefixes:
>+					path = '%(version)s/%(part)s/%(patch)s' % repo
>+					if ep:
>+						path += ep
>+					path += '/Packages.gz'
> 
>+					try:
>+						assert server.access(path)
>+						path = '%(prefix)s%(version)s/%(part)s/%(patch)s' % repo
>+						if ep:
>+							path += ep
>+						result.append('deb %s/ ./' % path)
>+						if cleanComponent:
>+							result.append('clean %s/' % path)
>+					except DownloadError, e:
>+						ud.debug(ud.NETWORK, ud.ALL, "%s" % e)
>+
> 		return result
> 
> 	def _releases_in_range(self, start=None, end=None):

Actions: View | Diff

Attachments on bug 27098: 4376 | 4377