From cd6788a56bc8e0483906d8823993398c7297048e Mon Sep 17 00:00:00 2001 From: Gonzalo Odiard Date: Thu, 7 Oct 2010 17:28:02 -0300 Subject: [PATCH 2/2] Changes to use a string insted of a int in the activity version --- src/sugar/activity/bundlebuilder.py | 6 +++--- src/sugar/bundle/activitybundle.py | 10 ++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/sugar/activity/bundlebuilder.py b/src/sugar/activity/bundlebuilder.py index fc8ebc8..9ac7f30 100644 --- a/src/sugar/activity/bundlebuilder.py +++ b/src/sugar/activity/bundlebuilder.py @@ -86,13 +86,13 @@ class Config(object): self.bundle_id = bundle.get_bundle_id() self.bundle_name = reduce(lambda x, y: x+y, self.activity_name.split()) self.bundle_root_dir = self.bundle_name + '.activity' - self.tar_root_dir = '%s-%d' % (self.bundle_name, self.version) + self.rar_root_dir = '%s-%s' % (self.bundle_name, self.version) if self.dist_name: self.xo_name = self.tar_name = self.dist_name else: - self.xo_name = '%s-%d.xo' % (self.bundle_name, self.version) - self.tar_name = '%s-%d.tar.bz2' % (self.bundle_name, self.version) + self.xo_name = '%s-%s.xo' % (self.bundle_name, self.version) + self.tar_name = '%s-%s.tar.bz2' % (self.bundle_name, self.version) class Builder(object): diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py index 3bbc250..a6386e4 100644 --- a/src/sugar/bundle/activitybundle.py +++ b/src/sugar/bundle/activitybundle.py @@ -59,7 +59,7 @@ class ActivityBundle(Bundle): self._mime_types = None self._show_launcher = True self._tags = None - self._activity_version = 0 + self._activity_version = '0' self._installation_time = os.stat(path).st_mtime self._manifest = None @@ -195,13 +195,7 @@ class ActivityBundle(Bundle): self._icon = cp.get(section, 'icon') if cp.has_option(section, 'activity_version'): - version = cp.get(section, 'activity_version') - try: - self._activity_version = int(version) - except ValueError: - raise MalformedBundleException( - 'Activity bundle %s has invalid version number %s' % - (self._path, version)) + self._activity_version = cp.get(section, 'activity_version') def _get_linfo_file(self): lang = locale.getdefaultlocale()[0] -- 1.7.2.3