test for presence of config files before sourcing them (works with both dash and...

diff --git a/debian/70monkeysphere_use-validation-agent b/debian/70monkeysphere_use-validation-agent
index eec1ff68c8705747f4c1fc213368293c68f040b8..894de12993c32faac8dedc3197e97909ee8f8de8 100644 (file)
--- a/debian/70monkeysphere_use-validation-agent
+++ b/debian/70monkeysphere_use-validation-agent
@@ -30,8 +30,8 @@ MSUSERCONFIG="$HOME/.monkeysphere/monkeysphere.conf"
 
 if [ -x "$MSVAGENT" ] ; then
    if [ "$(USE_VALIDATION_AGENT=
-. "$MSSYSCONFIG" 2>/dev/null || :
-. "$MSUSERCONFIG" 2>/dev/null || :
+[ -r "$MSSYSCONFIG" ]  && . "$MSSYSCONFIG" 2>/dev/null || :
+[ -r "$MSUSERCONFIG" ] && . "$MSUSERCONFIG" 2>/dev/null || :
 printf '%s' "$USE_VALIDATION_AGENT")" = "true" ] ; then
         STARTUP="$MSVAGENT $STARTUP"
     fi

diff --git a/debian/changelog b/debian/changelog
index a3cc235ea32be8ac39bfe23bd36622123555c941..66d9fcc7ff3895b74d5a826c77b85a84cb8cbbdc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+monkeysphere (0.31-2~pre) UNRELEASED; urgency=low
+
+  * fix X11 session initialization script for systems with dash as /bin/sh
+    (resolves MS #2471)
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Tue, 10 Aug 2010 14:07:45 -0400
+
 monkeysphere (0.31-1) unstable; urgency=low
 
   * New Upstream Release