diff options
| author | Simon Schampijer <simon@schampijer.de> | 2010-08-16 14:12:11 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2010-08-16 14:12:11 (GMT) |
| commit | e11b7d319626691a18db3b3e87f5f66c04102695 (patch) | |
| tree | b05b66a355634b0a329d0ec6030711521f3a3326 | |
| parent | 3f68813dd667a3da4064072b4adac15ca1ad5b57 (diff) | |
Support dropped for activity.info fields 'service_name' and 'class'
You have to use 'bundle_id' and 'exec' instead now.
| -rw-r--r-- | src/sugar/bundle/activitybundle.py | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py index c83257f..fe241f3 100644 --- a/src/sugar/bundle/activitybundle.py +++ b/src/sugar/bundle/activitybundle.py @@ -71,7 +71,7 @@ class ActivityBundle(Bundle): self._parse_linfo(linfo_file) if self._local_name == None: - self._local_name = self._name + self._local_name = self._name def _get_manifest(self): if self._manifest is None: @@ -149,9 +149,6 @@ class ActivityBundle(Bundle): if cp.has_option(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: raise MalformedBundleException( 'Activity bundle %s does not specify a bundle id' % @@ -163,10 +160,7 @@ class ActivityBundle(Bundle): raise MalformedBundleException( 'Activity bundle %s does not specify a name' % self._path) - # FIXME class is deprecated - if cp.has_option(section, 'class'): - self.activity_class = cp.get(section, 'class') - elif cp.has_option(section, 'exec'): + if cp.has_option(section, 'exec'): self.bundle_exec = cp.get(section, 'exec') else: raise MalformedBundleException( |