← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/ubuntuone-client/oneiric

« back to all changes in this revision

Viewing changes to contrib/dbus_util.py

  • Committer: Bazaar Package Importer
  • Author(s): Rodney Dawes
  • Date: 2010-06-16 09:37:28 UTC
  • mto: This revision was merged to the branch mainline in revision 32.
  • Revision ID: james.westby@ubuntu.com-20100616093728-bf5j3x91t8ypmg1h
Tags: upstream-1.3.1
Import upstream version 1.3.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
contrib/dbus_util.py
21
21
 
22
22
from distutils.spawn import find_executable
23
23
 
 
24
SRCDIR = os.environ.get('SRCDIR', os.getcwd())
24
25
 
25
26
class DBusLaunchError(Exception):
26
27
    """Error while launching dbus-daemon"""
44
45
        if not dbus:
45
46
            raise NotFoundError("dbus-daemon was not found.")
46
47
 
47
 
        config_file = os.path.join(os.getcwd(), "contrib", "testing",
 
48
        config_file = os.path.join(os.path.abspath(SRCDIR),
 
49
                                   "contrib", "testing",
48
50
                                   "dbus-session.conf")
49
51
        dbus_args = ["--fork",
50
52
                     "--config-file=" + config_file,