Merge lp:~nataliabidart/magicicada-client/avoid-import-error-precise into lp:magicicada-client

[Natalia Bidart]

- Avoid "ImportError: cannot import name get_program_path" on precise.
- Added missing dependency on python-qt4-dbus.

[Natalia Bidart (nataliabidart)]

review: Approve

=== modified file '.bzrignore'
--- .bzrignore	2015-09-19 21:11:52 +0000
+++ .bzrignore	2015-09-20 00:25:29 +0000
@@ -11,8 +11,8 @@
 *.pyc
 *.service
 
+.env
+.protocol
 clientdefs.py
-env
 logging.conf
-.protocol
 ubuntuone/storageprotocol

=== modified file 'dependencies.txt'
--- dependencies.txt	2015-09-19 23:31:26 +0000
+++ dependencies.txt	2015-09-20 00:25:29 +0000
@@ -4,6 +4,7 @@
 python-gi
 python-protobuf
 python-pyinotify
+python-qt4-dbus
 python-qt4reactor
 python-twisted
 python-ubuntu-sso-client

=== modified file 'ubuntuone/syncdaemon/utils.py'
--- ubuntuone/syncdaemon/utils.py	2012-11-28 00:10:36 +0000
+++ ubuntuone/syncdaemon/utils.py	2015-09-20 00:25:29 +0000
@@ -33,7 +33,13 @@
 
 from twisted.python import procutils
 
-from dirspec.utils import get_program_path
+try:
+    from dirspec.utils import get_program_path
+except ImportError:
+    get_program_path = (
+        lambda exe_name, **kw: os.path.abspath(
+            os.path.join(os.path.curdir, 'bin', exe_name)))
+
 
 SYNCDAEMON_EXECUTABLE = 'ubuntuone-syncdaemon'
 TUNNEL_EXECUTABLE = 'ubuntuone-proxy-tunnel'