aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Shaw <[email protected]>2005-02-24 21:21:14 +0000
committerDavid Shaw <[email protected]>2005-02-24 21:21:14 +0000
commit522ca120846e5f094abd850143cb2cee4419b6e6 (patch)
treeffb3987286f77a45d73ceca7ad1be83c17e49aac
parent* gnupg.spec.in: Fix problem with storing the gpgkeys helpers in (diff)
downloadgnupg-522ca120846e5f094abd850143cb2cee4419b6e6.tar.gz
gnupg-522ca120846e5f094abd850143cb2cee4419b6e6.zip
* keyedit.c (keyedit_menu): Only print the key signing hint when signing
from a place where it is useful (i.e. --edit-key and not --sign-key).
-rw-r--r--g10/ChangeLog6
-rw-r--r--g10/keyedit.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog
index c2fe6d1ca..cd0da9464 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2005-02-24 David Shaw <[email protected]>
+
+ * keyedit.c (keyedit_menu): Only print the key signing hint when
+ signing from a place where it is useful (i.e. --edit-key and not
+ --sign-key).
+
2005-02-16 Werner Koch <[email protected]>
* card-util.c (fetch_url): Fetch the key from the default
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 27cd94102..46759ef82 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -1637,7 +1637,8 @@ keyedit_menu( const char *username, STRLIST locusr,
}
}
- if( count_uids(keyblock) > 1 && !count_selected_uids(keyblock) )
+ if( count_uids(keyblock) > 1 && !count_selected_uids(keyblock)
+ && !have_commands )
{
if( !cpr_get_answer_is_yes("keyedit.sign_all.okay",
_("Really sign all user IDs?"