michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-05-04 22:30:33 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Suppress warnings when gpg doesn't output anything http://virtualmin.com/node/36979

Browse Source
This commit is contained in:
Jamie Cameron
2015-04-28 20:57:18 -07:00
parent c1105d0ac5
commit c153fae3d8
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webmin/gnupg-lib.pl
View File

@@ -298,7 +298,7 @@ else {
#close($fh);
#local $out = $wait_for_input;
&clean_language();
my $out = &backquote_command("$cmd 2>&1 </dev/null");
my $out = &backquote_command("$cmd 2>&1 </dev/null") || "";
&reset_environment();
unlink($datafile);
unlink($sigfile) if ($sigfile);
@@ -416,7 +416,7 @@ sub fetch_gpg_key
my ($id) = @_;
my $out = &backquote_command(
"$gpgpath --keyserver ".quotemeta($config{'keyserver'}).
" --recv-key ".quotemeta($id)." 2>&1 </dev/null");
" --recv-key ".quotemeta($id)." 2>&1 </dev/null") || "";
my @keys = &list_keys();
my ($key) = grep { lc($_->{'key'}) eq lc($id) } @keys;
if ($?) {