From: Jameson Graef Rollins <jrollins@finestructure.net>
Date: Thu, 12 Feb 2009 18:29:30 +0000 (-0500)
Subject: clean up how trust level was check in ma/setup, with some debug output
X-Git-Tag: monkeysphere_0.23~111
X-Git-Url: https://codewiz.org/gitweb?p=monkeysphere.git;a=commitdiff_plain;h=0cc9a8f041a9b9b97e7f5f24f71a92961e54c4f2

clean up how trust level was check in ma/setup, with some debug output
---

diff --git a/src/share/ma/setup b/src/share/ma/setup
index 034f047..894db84 100644
--- a/src/share/ma/setup
+++ b/src/share/ma/setup
@@ -85,7 +85,10 @@ EOF
     # our preferences are reasonable (i.e. 3 marginal OR 1 fully
     # trusted certifications are sufficient to grant full validity.
     log debug "check trust level of core key..."
-    if [ "1:3:1" != $(gpg_sphere --with-colons --fixed-list-mode --list-keys | head -n1 | grep ^tru: cut -f3,6,7 -d:) ] ; then
+    local TRUST_LEVEL=$(gpg_sphere --with-colons --fixed-list-mode --list-keys \
+	| head -n1 | grep "^tru:" | cut -d: -f3,6,7)
+    log debug "trust level: $TRUST_LEVEL"
+    if [ "$TRUST_LEVEL" != '1:3:1' ] ; then
 	failure "monkeysphere-authentication does not have the expected trust model settings."
     fi
 }