From: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
Date: Tue, 15 Jun 2010 18:29:56 +0000 (-0400)
Subject: update Xsession.d script to avoid choking when /etc/monkeysphere/monkeysphere.conf... 
X-Git-Tag: monkeysphere_0.31-1~3
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=6c031b901f77d1c66c29070be8a6e4e9f84c7acc;p=monkeysphere.git

update Xsession.d script to avoid choking when /etc/monkeysphere/monkeysphere.conf has been removed
---

diff --git a/debian/70monkeysphere_use-validation-agent b/debian/70monkeysphere_use-validation-agent
index c3135a8..eec1ff6 100644
--- 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 ed88370..aa2480d 100644
--- 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