projects
/
monkeysphere.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
updated man page for pem2openpgp.
[monkeysphere.git]
/
src
/
share
/
common
diff --git
a/src/share/common
b/src/share/common
index ef931ca4bc7a20282be621bfa533830c9cfef8bb..00a10080008571b4cd89b40f10fcc59015f26dfd 100644
(file)
--- a/
src/share/common
+++ b/
src/share/common
@@
-34,7
+34,8
@@
failure() {
# write output to stderr based on specified LOG_LEVEL the first
# parameter is the priority of the output, and everything else is what
# write output to stderr based on specified LOG_LEVEL the first
# parameter is the priority of the output, and everything else is what
-# is echoed to stderr
+# is echoed to stderr. If there is nothing else, then output comes
+# from stdin, and is not prefaced by log prefix.
log() {
local priority
local level
log() {
local priority
local level
@@
-79,8
+80,12
@@
log() {
output=true
fi
if [ "$priority" = "$level" -a "$output" = 'true' ] ; then
output=true
fi
if [ "$priority" = "$level" -a "$output" = 'true' ] ; then
- echo -n "ms: " >&2
- echo "$@" >&2
+ if [ "$1" ] ; then
+ echo -n "ms: " >&2
+ echo "$@" >&2
+ else
+ cat >&2
+ fi
fi
done
}
fi
done
}
@@
-533,12
+538,6
@@
gpg_fetch_userid() {
--search ="$userID" > /dev/null 2>&1
returnCode="$?"
--search ="$userID" > /dev/null 2>&1
returnCode="$?"
- # if the user is the monkeysphere user, then update the
- # monkeysphere user's trustdb
- if [ $(id -un) = "$MONKEYSPHERE_USER" ] ; then
- gpg_authentication "--check-trustdb" > /dev/null 2>&1
- fi
-
return "$returnCode"
}
return "$returnCode"
}