Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSimon Schampijer <simon@schampijer.de>2010-11-25 11:07:36 (GMT)
committer Simon Schampijer <simon@schampijer.de>2010-11-25 11:07:36 (GMT)
commit6c1681ef7be635bae2a367913094443cd6c388f1 (patch)
tree0a1258d2b0282590a21dc92e5518ddf30a7cc088 /src
parent160a224cb6236cd978b3f3982874ea3592840a2b (diff)
Apply new version scheme as well to content bundles #10379
Reviewed-by: James Cameron<quozl@laptop.org>
Diffstat (limited to 'src')
-rw-r--r--src/sugar/bundle/contentbundle.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/src/sugar/bundle/contentbundle.py b/src/sugar/bundle/contentbundle.py
index 2d19417..7ee486e 100644
--- a/src/sugar/bundle/contentbundle.py
+++ b/src/sugar/bundle/contentbundle.py
@@ -29,6 +29,9 @@ from sugar import env
from sugar.bundle.bundle import Bundle, NotInstalledException, \
MalformedBundleException
+from sugar.bundle.bundleversion import NormalizedVersion
+from sugar.bundle.bundleversion import InvalidVersionError
+
class ContentBundle(Bundle):
"""A Sugar content bundle
@@ -51,7 +54,7 @@ class ContentBundle(Bundle):
self._subcategory = None
self._category_class = None
self._category_icon = None
- self._library_version = None
+ self._library_version = '0'
self._bundle_class = None
self._activity_start = None
self._global_name = None
@@ -94,11 +97,12 @@ class ContentBundle(Bundle):
if cp.has_option(section, 'library_version'):
version = cp.get(section, 'library_version')
try:
- self._library_version = int(version)
- except ValueError:
+ NormalizedVersion(version)
+ except InvalidVersionError:
raise MalformedBundleException(
'Content bundle %s has invalid version number %s' %
(self._path, version))
+ self._library_version = version
if cp.has_option(section, 'l10n'):
l10n = cp.get(section, 'l10n')