Merge commit 'dkg/master'

[monkeysphere.git] / src / share / common

diff --git a/src/share/common b/src/share/common
index d185fddf70cf142aab145ec2e7013eef2fd66b44..9630bf9adbb2827100c0a7a33f3c9e01e660fcdf 100644 (file)
--- a/src/share/common
+++ b/src/share/common
@@ -21,7 +21,7 @@ SYSCONFIGDIR=${MONKEYSPHERE_SYSCONFIGDIR:-"/etc/monkeysphere"}
 export SYSCONFIGDIR
 
 # monkeysphere version
-VERSION=__VERSION__
+VERSION=0.23~pre
 
 # default log level
 LOG_LEVEL="INFO"
@@ -291,7 +291,7 @@ get_gpg_expiration() {
 
     keyExpire="$1"
 
-    if [ -z "$keyExpire" ]; then
+    if [ -z "$keyExpire" -a "$PROMPT" = 'true' ]; then
        cat >&2 <<EOF
 Please specify how long the key should be valid.
          0 = key does not expire