diff options
| author | Jonas Smedegaard <dr@jones.dk> | 2008-11-11 18:14:10 (GMT) |
|---|---|---|
| committer | Jonas Smedegaard <dr@jones.dk> | 2008-11-11 18:14:10 (GMT) |
| commit | c29b95a23b78ae98d406d7a2ee40cfa2cb0f750d (patch) | |
| tree | 3c6c8a4336fc87825710fcd001357c6712d1ab42 | |
| parent | b47520b5a24dbeb0985112d5d01874c35824a7bc (diff) | |
| parent | 3b549e6c8693581d5bee085a28a8b1a903784816 (diff) | |
Merge commit 'v0.82.1' into upstream
| -rwxr-xr-x | bin/copy-from-journal | 3 | ||||
| -rwxr-xr-x | bin/copy-to-journal | 3 | ||||
| -rw-r--r-- | configure.ac | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/bin/copy-from-journal b/bin/copy-from-journal index 61b91c9..9be49d4 100755 --- a/bin/copy-from-journal +++ b/bin/copy-from-journal @@ -9,6 +9,9 @@ import os import shutil import optparse +if os.path.exists("/tmp/olpc-session-bus"): + os.environ["DBUS_SESSION_BUS_ADDRESS"] = "unix:path=/tmp/olpc-session-bus" + from sugar.datastore import datastore import sugar.mime diff --git a/bin/copy-to-journal b/bin/copy-to-journal index b45677a..ce72f2b 100755 --- a/bin/copy-to-journal +++ b/bin/copy-to-journal @@ -11,6 +11,9 @@ import sys import os import optparse +if os.path.exists("/tmp/olpc-session-bus"): + os.environ["DBUS_SESSION_BUS_ADDRESS"] = "unix:path=/tmp/olpc-session-bus" + from sugar.datastore import datastore def build_option_parser(): diff --git a/configure.ac b/configure.ac index dbcc25d..9b0eabf 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([sugar-datastore],[0.82.0],[],[sugar-datastore]) +AC_INIT([sugar-datastore],[0.82.1],[],[sugar-datastore]) AC_PREREQ([2.59]) |