Attachment 3273 Details for Bug 22530

[patch] Fix repository/online/component/$comp/version=2.3,2.4 not being converted to UCS_Version() instance.

22530_univention-updater-comp-version-str.diff (text/plain), 995 bytes, created by Philipp Hahn on 2011-05-16 12:25 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Philipp Hahn

Created: 2011-05-16 12:25 CEST

Size: 995 bytes

patch

obsolete

>Bug #22530: Fix repository/online/component/$comp/version=2.3,2.4 not being converted to UCS_Version() instance.
>--- updater/tools.py	(Revision 23493)
>+++ updater/tools.py	(Arbeitskopie)
>@@ -1118,6 +1118,10 @@
> 					mm_versions = self._releases_in_range(start, end)
> 				versions |= set(mm_versions)
> 			else:
>+				if '-' in version:
>+					version = UCS_Version(version)
>+				else:
>+					version = UCS_Version('%s-0' % version)
> 				versions.add(version)
> 		return versions
> 
>--- management/console/handlers/update/__init__.py	(Revision 23517)
>+++ management/console/handlers/update/__init__.py	(Arbeitskopie)
>@@ -707,7 +707,7 @@
> 				fn = object.options.get(key)
> 				# some security checks
> 				if not fn.startswith('/var/log/univention/'):
>-					self.finished(object.id(), 'invalid filename%s: access not allowed by UMC module' % fn)
>+					self.finished(object.id(), 'invalid filename %s: access not allowed by UMC module' % fn)
> 					return
> 				else:
> 					# create fd if fd is not present

Actions: View | Diff

Attachments on bug 22530: 3273