summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorNirbheek Chauhan <nirbheek@gentoo.org>2011-02-26 04:03:14 +0530
committerNirbheek Chauhan <nirbheek@gentoo.org>2011-02-26 04:03:14 +0530
commit8a28f2cbf3ca8e52a456d49989f9d1449dd459a5 (patch)
tree32528458453e51a9b647932e7c003d3daa8f5bb1 /eclass
parentgnome-base/gnome-shell: fix python shebangs (diff)
downloadgnome-8a28f2cbf3ca8e52a456d49989f9d1449dd459a5.tar.gz
gnome-8a28f2cbf3ca8e52a456d49989f9d1449dd459a5.tar.bz2
gnome-8a28f2cbf3ca8e52a456d49989f9d1449dd459a5.zip
eclass/{gnome2,gnome2-live}: unset DBUS_SESSION_BUS_ADDRESS
Diffstat (limited to 'eclass')
-rw-r--r--eclass/gnome2-live.eclass5
-rw-r--r--eclass/gnome2.eclass5
2 files changed, 10 insertions, 0 deletions
diff --git a/eclass/gnome2-live.eclass b/eclass/gnome2-live.eclass
index f119624c..03654ae4 100644
--- a/eclass/gnome2-live.eclass
+++ b/eclass/gnome2-live.eclass
@@ -121,6 +121,11 @@ gnome2-live_src_prepare() {
ln -sf $(type -P true) py-compile
### Keep this in-sync with gnome2.eclass!
+
+ # Don't use the session bus address inherited via the environment
+ # causes test and introspection-building failures
+ unset DBUS_SESSION_BUS_ADDRESS
+
# Prevent scrollkeeper access violations
gnome2_omf_fix
diff --git a/eclass/gnome2.eclass b/eclass/gnome2.eclass
index a335698f..192fc169 100644
--- a/eclass/gnome2.eclass
+++ b/eclass/gnome2.eclass
@@ -55,6 +55,10 @@ gnome2_src_unpack() {
}
gnome2_src_prepare() {
+ # Don't use the session bus address inherited via the environment
+ # causes test and introspection-building failures
+ unset DBUS_SESSION_BUS_ADDRESS
+
# Prevent scrollkeeper access violations
gnome2_omf_fix
@@ -63,6 +67,7 @@ gnome2_src_prepare() {
}
gnome2_src_configure() {
+ einfo dbus:$DBUS_SESSION_BUS_ADDRESS
# Update the GNOME configuration options
if [[ ${GCONF_DEBUG} != 'no' ]] ; then
if use debug ; then