From 51f64c60bc9129b7631874eaeb18367096d04a58 Mon Sep 17 00:00:00 2001
From: Sascha Silbe <sascha@silbe.org>
Date: Mon, 24 Aug 2009 09:23:19 +0000
Subject: don't override Sugar logger configuration environment variables if they have already been set

---
diff --git a/sjhbuild/config.py b/sjhbuild/config.py
index d209a29..d15f476 100644
--- a/sjhbuild/config.py
+++ b/sjhbuild/config.py
@@ -47,12 +47,12 @@ class Config(jhbuild.config.Config):
 
         os.environ['SUGAR_PREFIX'] = self.prefix
         os.environ['SUGAR_PATH'] = os.path.join(self.prefix, 'share', 'sugar')
-        os.environ['SUGAR_LOGGER_LEVEL'] = 'debug'
+        os.environ.setdefault('SUGAR_LOGGER_LEVEL', 'debug')
 
         # Enable debug log of the Telepathy components
-        os.environ['GABBLE_DEBUG'] = 'all'
-        os.environ['SALUT_DEBUG'] = 'all'
-        os.environ['STREAM_ENGINE_DEBUG'] = 'all'
+        os.environ.setdefault('GABBLE_DEBUG', 'all')
+        os.environ.setdefault('SALUT_DEBUG', 'all')
+        os.environ.setdefault('STREAM_ENGINE_DEBUG', 'all')
 
         # We need to add the gtk-2.0 directory explicitly to
         # the Python path since '.pth' files (here pygtk.pth)
--
cgit v0.9.1