sugarlabs/sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply new version scheme as well to content bundles #2425

Browse Source 
Reviewed-by: James Cameron <quozl@laptop.org>
This commit is contained in:
Simon Schampijer 2010-11-24 22:40:16 +01:00
parent aadfeed305
commit 18e39672ce
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/sugar/bundle/contentbundle.py
View File

@ -29,6 +29,9 @@ from sugar import env
from sugar.bundle.bundle import Bundle, NotInstalledException, \ from sugar.bundle.bundle import Bundle, NotInstalledException, \
MalformedBundleException MalformedBundleException
from sugar.bundle.bundleversion import NormalizedVersion
from sugar.bundle.bundleversion import InvalidVersionError
class ContentBundle(Bundle): class ContentBundle(Bundle):
"""A Sugar content bundle """A Sugar content bundle
@ -52,7 +55,7 @@ class ContentBundle(Bundle):
self._subcategory = None self._subcategory = None
self._category_class = None self._category_class = None
self._category_icon = None self._category_icon = None
self._library_version = None self._library_version = '0'
self._bundle_class = None self._bundle_class = None
self._activity_start = None self._activity_start = None
self._global_name = None self._global_name = None
@ -83,11 +86,12 @@ class ContentBundle(Bundle):
if cp.has_option(section, 'library_version'): if cp.has_option(section, 'library_version'):
version = cp.get(section, 'library_version') version = cp.get(section, 'library_version')
try: try:
self._library_version = int(version) NormalizedVersion(version)
except ValueError: except InvalidVersionError:
raise MalformedBundleException( raise MalformedBundleException(
'Content bundle %s has invalid version number %s' % 'Content bundle %s has invalid version number %s' %
(self._path, version)) (self._path, version))
self._library_version = version
if cp.has_option(section, 'l10n'): if cp.has_option(section, 'l10n'):
l10n = cp.get(section, 'l10n') l10n = cp.get(section, 'l10n')