update Xsession.d script to avoid choking when /etc/monkeysphere/monkeysphere.conf...

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

diff --git a/debian/changelog b/debian/changelog
index ed883700cebaaad61c36ed7d310214542b381958..aa2480d6dd89b4d98af54decbd73b8c8e8cecc37 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 monkeysphere (0.31~pre-1) UNRELEASED; urgency=low
 
   * New Upstream Release
+  * updated Xsession.d script to avoid choking when
+    /etc/monkeysphere/monkeysphere.conf has been removed.
 
  -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Thu, 06 May 2010 11:25:30 -0400