diff options
| author | Simon Schampijer <simon@schampijer.de> | 2010-08-17 14:57:02 (GMT) |
|---|---|---|
| committer | Simon Schampijer <simon@schampijer.de> | 2010-08-17 14:57:02 (GMT) |
| commit | acd8095a29f2f922acce3e907fb71a6019eff113 (patch) | |
| tree | ba6d56a32ed7abe9ec47695ad65070b05ddd0780 | |
| parent | 4dc2b3db2306ae45da115c2de6053753d9312907 (diff) | |
Revert "Support dropped for activity.info fields 'service_name' and 'class'"
This reverts commit e11b7d319626691a18db3b3e87f5f66c04102695.
| -rw-r--r-- | src/sugar/bundle/activitybundle.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py index fe241f3..c83257f 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,6 +149,9 @@ 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' % @@ -160,7 +163,10 @@ class ActivityBundle(Bundle): raise MalformedBundleException( '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') else: raise MalformedBundleException( |