mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +02:00
* keyserver.c (keyserver_refresh): Don't print the "refreshing..." line if
there are no keys to refresh or if there is no keyserver set. * getkey.c (merge_selfsigs_main): Any valid user ID should make a key valid, not just the last one. This also fixes Debian bug #174276.
This commit is contained in:
parent
98ef43987a
commit
55eda4b4f8
3 changed files with 26 additions and 7 deletions
|
@ -1263,17 +1263,23 @@ keyserver_refresh(STRLIST users)
|
|||
if(rc)
|
||||
return rc;
|
||||
|
||||
if(count==1)
|
||||
log_info(_("refreshing 1 key from %s\n"),opt.keyserver_uri);
|
||||
else
|
||||
log_info(_("refreshing %d keys from %s\n"),count,opt.keyserver_uri);
|
||||
|
||||
if(count>0)
|
||||
rc=keyserver_work(GET,NULL,desc,count);
|
||||
{
|
||||
if(opt.keyserver_uri)
|
||||
{
|
||||
if(count==1)
|
||||
log_info(_("refreshing 1 key from %s\n"),opt.keyserver_uri);
|
||||
else
|
||||
log_info(_("refreshing %d keys from %s\n"),
|
||||
count,opt.keyserver_uri);
|
||||
}
|
||||
|
||||
rc=keyserver_work(GET,NULL,desc,count);
|
||||
}
|
||||
|
||||
m_free(desc);
|
||||
|
||||
return 0;
|
||||
return rc;
|
||||
}
|
||||
|
||||
int
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue