1
0
mirror of git://git.gnupg.org/gnupg.git synced 2024-12-22 10:19:57 +01:00

Minor bug fix.

This commit is contained in:
Werner Koch 2008-12-09 12:32:53 +00:00
parent d478455c17
commit cb1d526227
3 changed files with 10 additions and 6 deletions

View File

@ -24,8 +24,8 @@ min_automake_version="1.10"
# Remember to change the version number immediately *after* a release. # Remember to change the version number immediately *after* a release.
# Set my_issvn to "yes" for non-released code. Remember to run an # Set my_issvn to "yes" for non-released code. Remember to run an
# "svn up" and "autogen.sh" right before creating a distribution. # "svn up" and "autogen.sh" right before creating a distribution.
m4_define([my_version], [2.0.10rc1]) m4_define([my_version], [2.0.10])
m4_define([my_issvn], [no]) m4_define([my_issvn], [yes])
m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \ m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \
| sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)])) | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)]))
AC_INIT([gnupg], AC_INIT([gnupg],

View File

@ -1,3 +1,7 @@
2008-12-09 Werner Koch <wk@g10code.com>
* gpg.c (main) [IS_DEVELOPMENT_VERSION]: Fix strusage use.
2008-12-09 Werner Koch <wk@g10code.com> 2008-12-09 Werner Koch <wk@g10code.com>
* keygen.c (proc_parameter_file): Check that key and subkey usages * keygen.c (proc_parameter_file): Check that key and subkey usages

View File

@ -2936,15 +2936,15 @@ main (int argc, char **argv)
fprintf(stderr, "%s\n", strusage(15) ); fprintf(stderr, "%s\n", strusage(15) );
} }
#ifdef IS_DEVELOPMENT_VERSION #ifdef IS_DEVELOPMENT_VERSION
if( !opt.batch ) if (!opt.batch)
{ {
const char *s; const char *s;
if((s=strusage(20))) if((s=strusage(25)))
log_info("%s\n",s); log_info("%s\n",s);
if((s=strusage(21))) if((s=strusage(26)))
log_info("%s\n",s); log_info("%s\n",s);
if((s=strusage(22))) if((s=strusage(27)))
log_info("%s\n",s); log_info("%s\n",s);
} }
#endif #endif