diff options
author | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-09 11:32:32 (GMT) |
---|---|---|
committer | Marco Pesenti Gritti <mpg@redhat.com> | 2007-03-09 11:32:32 (GMT) |
commit | 2d9a06ec9a1a3779b169ec1ef70c542821270b25 (patch) | |
tree | c87c53161dc892ed65308d55040b356b13e01713 | |
parent | 810bea67728b78953ac585b6a15a1103e2a5c729 (diff) |
Add the root path of the services to python path, not services/.
Get rid of the now useless env.get_services_dir
-rwxr-xr-x | services/clipboard/sugar-clipboard | 5 | ||||
-rwxr-xr-x | services/console/sugar-console | 7 | ||||
-rwxr-xr-x | services/datastore/sugar-data-store | 5 | ||||
-rwxr-xr-x | services/presence/sugar-presence-service | 4 | ||||
-rwxr-xr-x | services/presence2/sugar-presence-service2 | 4 | ||||
-rw-r--r-- | sugar/__installed__.py.in | 1 | ||||
-rw-r--r-- | sugar/env.py | 3 |
7 files changed, 14 insertions, 15 deletions
diff --git a/services/clipboard/sugar-clipboard b/services/clipboard/sugar-clipboard index acc8657..576145c 100755 --- a/services/clipboard/sugar-clipboard +++ b/services/clipboard/sugar-clipboard @@ -18,6 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import sys +import os import logging from sugar import logger @@ -31,9 +32,9 @@ import dbus.glib from sugar import env -sys.path.insert(0, env.get_services_dir()) +sys.path.insert(0, os.path.join(env.get_data_dir(), 'services/clipboard')) -from clipboard.clipboardservice import ClipboardService +from clipboardservice import ClipboardService logging.info('Starting clipboard service.') diff --git a/services/console/sugar-console b/services/console/sugar-console index 78ea3a2..2f2fc4f 100755 --- a/services/console/sugar-console +++ b/services/console/sugar-console @@ -3,9 +3,10 @@ import pygtk pygtk.require('2.0') -import os, sys +import os +import sys from sugar import env -sys.path.insert(0, env.get_services_dir()) +sys.path.insert(0, os.path.join(env.get_data_dir(), 'services/console')) -import console.console +import console diff --git a/services/datastore/sugar-data-store b/services/datastore/sugar-data-store index b4a728b..9ab14fe 100755 --- a/services/datastore/sugar-data-store +++ b/services/datastore/sugar-data-store @@ -18,16 +18,17 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA import sys +import os import logging from sugar import logger from sugar import env -sys.path.insert(0, env.get_services_dir()) +sys.path.insert(0, os.path.join(env.get_data_dir(), 'services/datastore')) logger.start('data-store') logging.info('Starting the data store...') -from datastore import datastore +import datastore datastore.main() diff --git a/services/presence/sugar-presence-service b/services/presence/sugar-presence-service index b98db9a..50c1217 100755 --- a/services/presence/sugar-presence-service +++ b/services/presence/sugar-presence-service @@ -24,11 +24,11 @@ import os from sugar import logger from sugar import env -sys.path.insert(0, env.get_services_dir()) +sys.path.insert(0, os.path.join(env.get_data_dir(), 'services/presence')) logger.start('presenceservice') -from presence import PresenceService +import PresenceService logging.info('Starting presence service') diff --git a/services/presence2/sugar-presence-service2 b/services/presence2/sugar-presence-service2 index 5b5afd1..f71344a 100755 --- a/services/presence2/sugar-presence-service2 +++ b/services/presence2/sugar-presence-service2 @@ -24,11 +24,11 @@ import os from sugar import logger from sugar import env -sys.path.insert(0, env.get_services_dir()) +sys.path.insert(0, os.join.path(env.get_data_dir(), 'services/presence2')) logger.start('presenceservice') -from presence2 import presenceservice +import presenceservice logging.info('Starting presence service') diff --git a/sugar/__installed__.py.in b/sugar/__installed__.py.in index afe91d1..bf7fd9b 100644 --- a/sugar/__installed__.py.in +++ b/sugar/__installed__.py.in @@ -1,4 +1,3 @@ sugar_source_dir = None sugar_data_dir = '@prefix@/share/sugar' -sugar_services_dir = '@prefix@/share/sugar/services' sugar_shell_bin_dir = '@prefix@/bin' diff --git a/sugar/env.py b/sugar/env.py index afaa565..7d6cc7c 100644 --- a/sugar/env.py +++ b/sugar/env.py @@ -48,9 +48,6 @@ def get_profile_path(): def get_data_dir(): return sugar_data_dir -def get_services_dir(): - return sugar_services_dir - def get_shell_bin_dir(): return sugar_shell_bin_dir |