From cd6788a56bc8e0483906d8823993398c7297048e Mon Sep 17 00:00:00 2001
From: Gonzalo Odiard <godiard@sugarlabs.org>
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
|
b
|
class Config(object): |
86 | 86 | self.bundle_id = bundle.get_bundle_id() |
87 | 87 | self.bundle_name = reduce(lambda x, y: x+y, self.activity_name.split()) |
88 | 88 | self.bundle_root_dir = self.bundle_name + '.activity' |
89 | | self.tar_root_dir = '%s-%d' % (self.bundle_name, self.version) |
| 89 | self.rar_root_dir = '%s-%s' % (self.bundle_name, self.version) |
90 | 90 | |
91 | 91 | if self.dist_name: |
92 | 92 | self.xo_name = self.tar_name = self.dist_name |
93 | 93 | else: |
94 | | self.xo_name = '%s-%d.xo' % (self.bundle_name, self.version) |
95 | | self.tar_name = '%s-%d.tar.bz2' % (self.bundle_name, self.version) |
| 94 | self.xo_name = '%s-%s.xo' % (self.bundle_name, self.version) |
| 95 | self.tar_name = '%s-%s.tar.bz2' % (self.bundle_name, self.version) |
96 | 96 | |
97 | 97 | |
98 | 98 | class Builder(object): |
diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
index 3bbc250..a6386e4 100644
a
|
b
|
class ActivityBundle(Bundle): |
59 | 59 | self._mime_types = None |
60 | 60 | self._show_launcher = True |
61 | 61 | self._tags = None |
62 | | self._activity_version = 0 |
| 62 | self._activity_version = '0' |
63 | 63 | self._installation_time = os.stat(path).st_mtime |
64 | 64 | self._manifest = None |
65 | 65 | |
… |
… |
class ActivityBundle(Bundle): |
195 | 195 | self._icon = cp.get(section, 'icon') |
196 | 196 | |
197 | 197 | if cp.has_option(section, 'activity_version'): |
198 | | version = cp.get(section, 'activity_version') |
199 | | try: |
200 | | self._activity_version = int(version) |
201 | | except ValueError: |
202 | | raise MalformedBundleException( |
203 | | 'Activity bundle %s has invalid version number %s' % |
204 | | (self._path, version)) |
| 198 | self._activity_version = cp.get(section, 'activity_version') |
205 | 199 | |
206 | 200 | def _get_linfo_file(self): |
207 | 201 | lang = locale.getdefaultlocale()[0] |