gnupg/g10 (8 files)
cvs user dshaw
cvs at cvs.gnupg.org
Thu Oct 28 05:53:31 CEST 2004
Date: Thursday, October 28, 2004 @ 05:57:30
Author: dshaw
Path: /cvs/gnupg/gnupg/g10
Modified: ChangeLog card-util.c delkey.c keyedit.c keygen.c passphrase.c
plaintext.c revoke.c
* card-util.c, delkey.c, keygen.c, plaintext.c, keyedit.c, passphrase.c,
revoke.c: Collapse the two different "can't do that in batch mode" strings
into one.
--------------+
ChangeLog | 4 ++++
card-util.c | 4 ++--
delkey.c | 4 ++--
keyedit.c | 7 ++++---
keygen.c | 2 +-
passphrase.c | 4 ++--
plaintext.c | 7 ++++---
revoke.c | 14 ++++++++------
8 files changed, 27 insertions(+), 19 deletions(-)
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.631 gnupg/g10/ChangeLog:1.632
--- gnupg/g10/ChangeLog:1.631 Thu Oct 28 05:14:55 2004
+++ gnupg/g10/ChangeLog Thu Oct 28 05:57:30 2004
@@ -1,5 +1,9 @@
2004-10-27 David Shaw <dshaw at jabberwocky.com>
+ * card-util.c, delkey.c, keygen.c, plaintext.c, keyedit.c,
+ passphrase.c, revoke.c: Collapse the two different "can't do that
+ in batch mode" strings into one.
+
* keylist.c (status_one_subpacket): New. Send the subpacket data
to the --status interface.
Index: gnupg/g10/card-util.c
diff -u gnupg/g10/card-util.c:1.20 gnupg/g10/card-util.c:1.21
--- gnupg/g10/card-util.c:1.20 Thu Oct 28 05:14:55 2004
+++ gnupg/g10/card-util.c Thu Oct 28 05:57:30 2004
@@ -67,7 +67,7 @@
if (opt.batch)
{
- log_error (_("sorry, can't do this in batch mode\n"));
+ log_error (_("can't do this in batch mode\n"));
return;
}
@@ -1195,7 +1195,7 @@
;
else if (opt.batch && !have_commands)
{
- log_error(_("can't do that in batchmode\n"));
+ log_error(_("can't do this in batch mode\n"));
goto leave;
}
Index: gnupg/g10/delkey.c
diff -u gnupg/g10/delkey.c:1.18 gnupg/g10/delkey.c:1.19
--- gnupg/g10/delkey.c:1.18 Thu Oct 28 03:58:01 2004
+++ gnupg/g10/delkey.c Thu Oct 28 05:57:30 2004
@@ -117,14 +117,14 @@
okay++;
else if( opt.batch && secret )
{
- log_error(_("can't do that in batchmode\n"));
+ log_error(_("can't do this in batch mode\n"));
log_info (_("(unless you specify the key by fingerprint)\n"));
}
else if( opt.batch && opt.answer_yes )
okay++;
else if( opt.batch )
{
- log_error(_("can't do that in batchmode without \"--yes\"\n"));
+ log_error(_("can't do this in batch mode without \"--yes\"\n"));
log_info (_("(unless you specify the key by fingerprint)\n"));
}
else {
Index: gnupg/g10/keyedit.c
diff -u gnupg/g10/keyedit.c:1.154 gnupg/g10/keyedit.c:1.155
--- gnupg/g10/keyedit.c:1.154 Thu Oct 28 03:58:01 2004
+++ gnupg/g10/keyedit.c Thu Oct 28 05:57:30 2004
@@ -1309,10 +1309,11 @@
if ( opt.command_fd != -1 )
;
- else if( opt.batch && !have_commands ) {
- log_error(_("can't do that in batchmode\n"));
+ else if( opt.batch && !have_commands )
+ {
+ log_error(_("can't do this in batch mode\n"));
goto leave;
- }
+ }
/* get the public key */
rc = get_pubkey_byname (NULL, username, &keyblock, &kdbhd, 1);
Index: gnupg/g10/keygen.c
diff -u gnupg/g10/keygen.c:1.134 gnupg/g10/keygen.c:1.135
--- gnupg/g10/keygen.c:1.134 Fri Oct 15 11:39:25 2004
+++ gnupg/g10/keygen.c Thu Oct 28 05:57:30 2004
@@ -2417,7 +2417,7 @@
if (opt.batch && card_serialno)
{
/* We don't yet support unattended key generation. */
- log_error (_("sorry, can't do this in batch mode\n"));
+ log_error (_("can't do this in batch mode\n"));
return;
}
Index: gnupg/g10/passphrase.c
diff -u gnupg/g10/passphrase.c:1.65 gnupg/g10/passphrase.c:1.66
--- gnupg/g10/passphrase.c:1.65 Tue Oct 26 09:50:47 2004
+++ gnupg/g10/passphrase.c Thu Oct 28 05:57:30 2004
@@ -1050,7 +1050,7 @@
}
else if (opt.batch)
{
- log_error(_("can't query password in batchmode\n"));
+ log_error(_("can't query password in batch mode\n"));
pw = NULL;
}
else {
@@ -1208,7 +1208,7 @@
strcpy( pw, fd_passwd );
}
else if( opt.batch ) {
- log_error(_("can't query password in batchmode\n"));
+ log_error(_("can't query password in batch mode\n"));
pw = m_strdup( "" ); /* return an empty passphrase */
}
else {
Index: gnupg/g10/plaintext.c
diff -u gnupg/g10/plaintext.c:1.57 gnupg/g10/plaintext.c:1.58
--- gnupg/g10/plaintext.c:1.57 Thu Oct 14 09:11:56 2004
+++ gnupg/g10/plaintext.c Thu Oct 28 05:57:30 2004
@@ -463,11 +463,12 @@
tty_printf("No such file, try again or hit enter to quit.\n");
any++;
}
- else if( !fp ) {
- log_error("can't open `%s': %s\n", answer, strerror(errno) );
+ else if( !fp )
+ {
+ log_error(_("can't open `%s': %s\n"), answer, strerror(errno));
rc = G10ERR_READ_FILE;
goto leave;
- }
+ }
} while( !fp );
}
Index: gnupg/g10/revoke.c
diff -u gnupg/g10/revoke.c:1.40 gnupg/g10/revoke.c:1.41
--- gnupg/g10/revoke.c:1.40 Thu Oct 28 03:58:01 2004
+++ gnupg/g10/revoke.c Thu Oct 28 05:57:30 2004
@@ -211,10 +211,11 @@
u32 keyid[2];
int i,any=0;
- if( opt.batch ) {
- log_error(_("sorry, can't do this in batch mode\n"));
+ if( opt.batch )
+ {
+ log_error(_("can't do this in batch mode\n"));
return G10ERR_GENERAL;
- }
+ }
memset( &afx, 0, sizeof afx);
@@ -411,10 +412,11 @@
struct revocation_reason_info *reason = NULL;
KEYDB_SEARCH_DESC desc;
- if( opt.batch ) {
- log_error(_("sorry, can't do this in batch mode\n"));
+ if( opt.batch )
+ {
+ log_error(_("can't do this in batch mode\n"));
return G10ERR_GENERAL;
- }
+ }
memset( &afx, 0, sizeof afx);
init_packet( &pkt );
More information about the Gnupg-commits
mailing list