From: Sam Hartman <hartmans@debian.org>
Date: Fri, 3 Oct 2014 14:20:41 +0000 (-0400)
Subject: Remove debugging and fix postinst script to work when SHELL is not set.
X-Git-Tag: debian/1.4-9~2
X-Git-Url: http://www.project-moonshot.org/gitweb/?p=trust_router.git;a=commitdiff_plain;h=84022c382494d969004a9828590cf26c16d45095

Remove debugging and fix postinst script to work when SHELL is not set.
---

diff --git a/debian/changelog b/debian/changelog
index 83c0a33..0dcb06b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+moonshot-trust-router (1.4-7) unstable; urgency=medium
+
+  * Remove debugging and fix postinst script to work when SHELL is not set.
+
+ -- Sam Hartman <hartmans@debian.org>  Fri, 03 Oct 2014 10:20:15 -0400
+
 moonshot-trust-router (1.4-6) unstable; urgency=medium
 
   * Even more debugging
diff --git a/debian/control b/debian/control
index fd55188..d21c1de 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: git://git.project-moonshot.org/trust_router.git
 
 Package: moonshot-trust-router
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, moonshot-gss-eap, adduser, sqlite3, strace
+Depends: ${shlibs:Depends}, ${misc:Depends}, moonshot-gss-eap, adduser, sqlite3
 Description: Moonshot Trust Router
  Moonshot allows services using GSS-API applications to gain federated
  access to identities provided by other organizations.  Moonshot uses
diff --git a/debian/moonshot-trust-router.postinst b/debian/moonshot-trust-router.postinst
index 768167a..b300f17 100644
--- a/debian/moonshot-trust-router.postinst
+++ b/debian/moonshot-trust-router.postinst
@@ -14,15 +14,13 @@ set -e
 # for details, see http://www.debian.org/doc/debian-policy/ or
 # the debian-policy package
 
-set -x
-env
 
 case "$1" in
     configure)
         if dpkg --compare-versions "$2" lt 1.2-2; then
 	    adduser --quiet --system --home /var/lib/trust_router --group --disabled-login trustrouter
 	    fi
-	strace -f -F su -p -c "/usr/bin/sqlite3 </usr/share/trust_router/schema.sql /var/lib/trust_router/keys" trustrouter ||bash
+	su -s /bin/sh  -c "/usr/bin/sqlite3 </usr/share/trust_router/schema.sql /var/lib/trust_router/keys" trustrouter ||true
     ;;
 
     abort-upgrade|abort-remove|abort-deconfigure)