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

Revert "Support dropped for activity.info fields 'service_name' and 'class'"

Browse Source 
This reverts commit e11b7d3196.
This commit is contained in:
Simon Schampijer 2010-08-17 16:57:02 +02:00
parent 4dc2b3db23
commit acd8095a29
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -71,7 +71,7 @@ class ActivityBundle(Bundle):
self._parse_linfo(linfo_file) self._parse_linfo(linfo_file)
if self._local_name == None: if self._local_name == None:
self._local_name = self._name self._local_name = self._name
def _get_manifest(self): def _get_manifest(self):
if self._manifest is None: if self._manifest is None:
@ -149,6 +149,9 @@ class ActivityBundle(Bundle):
if cp.has_option(section, 'bundle_id'): if cp.has_option(section, 'bundle_id'):
self._bundle_id = cp.get(section, 'bundle_id') self._bundle_id = cp.get(section, 'bundle_id')
# FIXME deprecated
elif cp.has_option(section, 'service_name'):
self._bundle_id = cp.get(section, 'service_name')
else: else:
raise MalformedBundleException( raise MalformedBundleException(
'Activity bundle %s does not specify a bundle id' % 'Activity bundle %s does not specify a bundle id' %
@ -160,7 +163,10 @@ class ActivityBundle(Bundle):
raise MalformedBundleException( raise MalformedBundleException(
'Activity bundle %s does not specify a name' % self._path) 'Activity bundle %s does not specify a name' % self._path)
if cp.has_option(section, 'exec'): # FIXME class is deprecated
if cp.has_option(section, 'class'):
self.activity_class = cp.get(section, 'class')
elif cp.has_option(section, 'exec'):
self.bundle_exec = cp.get(section, 'exec') self.bundle_exec = cp.get(section, 'exec')
else: else:
raise MalformedBundleException( raise MalformedBundleException(