Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2008-11-11 18:14:11 (GMT)
committer Jonas Smedegaard <dr@jones.dk>2008-11-11 18:14:11 (GMT)
commitb9e70edb7a1ca6bb4630fbb311e5a3d04829043c (patch)
tree177fbbe00a7b831bb3d3339c4a3d6ad0cc017cc4
parentb251168ca76d6088709d74ab37fced59f327b18a (diff)
parent3b549e6c8693581d5bee085a28a8b1a903784816 (diff)
Merge commit 'v0.82.1'
-rwxr-xr-xbin/copy-from-journal3
-rwxr-xr-xbin/copy-to-journal3
-rw-r--r--configure.ac2
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])