Ticket #2425: 0002-Changes-to-use-a-string-insted-of-a-int-in-the-activ.patch

File 0002-Changes-to-use-a-string-insted-of-a-int-in-the-activ.patch, 2.5 KB (added by godiard, 14 years ago)

  • src/sugar/activity/bundlebuilder.py 

    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): 
    8686        self.bundle_id = bundle.get_bundle_id()
    8787        self.bundle_name = reduce(lambda x, y: x+y, self.activity_name.split())
    8888        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)
    9090
    9191        if self.dist_name:
    9292            self.xo_name = self.tar_name = self.dist_name
    9393        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)
    9696
    9797
    9898class Builder(object):

  • src/sugar/bundle/activitybundle.py 

    diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
index 3bbc250..a6386e4 100644
    a b class ActivityBundle(Bundle): 
    5959        self._mime_types = None
    6060        self._show_launcher = True
    6161        self._tags = None
    62         self._activity_version = 0
     62        self._activity_version = '0'
    6363        self._installation_time = os.stat(path).st_mtime
    6464        self._manifest = None
    6565
    … … class ActivityBundle(Bundle): 
    195195            self._icon = cp.get(section, 'icon')
    196196
    197197        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')
    205199
    206200    def _get_linfo_file(self):
    207201        lang = locale.getdefaultlocale()[0]