Fix bug #920.
This commit is contained in:
parent
4299dd6765
commit
a9c4e4b8e5
@ -1,5 +1,7 @@
|
|||||||
import dbus
|
import dbus
|
||||||
|
|
||||||
|
from sugar.activity import bundleregistry
|
||||||
|
|
||||||
_DBUS_SERVICE = "org.laptop.Shell"
|
_DBUS_SERVICE = "org.laptop.Shell"
|
||||||
_DBUS_INTERFACE = "org.laptop.Shell"
|
_DBUS_INTERFACE = "org.laptop.Shell"
|
||||||
_DBUS_PATH = "/org/laptop/Shell"
|
_DBUS_PATH = "/org/laptop/Shell"
|
||||||
@ -15,5 +17,5 @@ class ShellService(dbus.service.Object):
|
|||||||
|
|
||||||
@dbus.service.method(_DBUS_INTERFACE, in_signature="s", out_signature="b")
|
@dbus.service.method(_DBUS_INTERFACE, in_signature="s", out_signature="b")
|
||||||
def add_bundle(self, bundle_path):
|
def add_bundle(self, bundle_path):
|
||||||
registry = self._shellModel.get_bundle_registry()
|
registry = bundleregistry.get_registry()
|
||||||
return registry.add_bundle(bundle_path)
|
return registry.add_bundle(bundle_path)
|
||||||
|
@ -14,7 +14,7 @@ def get_bundle_root_dir(file_names):
|
|||||||
bundle_root_dir = None
|
bundle_root_dir = None
|
||||||
for file_name in file_names:
|
for file_name in file_names:
|
||||||
if not bundle_root_dir:
|
if not bundle_root_dir:
|
||||||
bundle_root_dir = file_name.partition('/')[0]
|
bundle_root_dir = file_name.split('/')[0]
|
||||||
if not bundle_root_dir.endswith('.activity'):
|
if not bundle_root_dir.endswith('.activity'):
|
||||||
raise 'Incorrect bundle.'
|
raise 'Incorrect bundle.'
|
||||||
else:
|
else:
|
||||||
|
Loading…
Reference in New Issue
Block a user