ambiser
/
btrbk
mirror of https://github.com/digint/btrbk
9
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrbk: warn on missing ssh identity; fixed logging

pull/30/head
Axel Burri 2015-01-20 21:07:28 +01:00
parent 029bac98e3
commit 4dd89e35e1
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
btrbk
View File

@ -170,7 +170,16 @@ sub get_rsh($$)
my $config = shift; my $config = shift;
if($config && ($url =~ /^ssh:\/\/(\S+?)(\/\S+)$/)) { if($config && ($url =~ /^ssh:\/\/(\S+?)(\/\S+)$/)) {
my ($ssh_host, $file) = ($1, $2); my ($ssh_host, $file) = ($1, $2);
my $rsh = "/usr/bin/ssh -i " . config_key($config, "ssh_identity") . ' ' . config_key($config, "ssh_user") . '@' . $ssh_host; my $ssh_user = config_key($config, "ssh_user");
my $ssh_identity = config_key($config, "ssh_identity");
my $ssh_options = "";
if($ssh_identity) {
$ssh_options .= " -i $ssh_identity";
}
else {
WARN "No SSH identity provided (option ssh_identity is not set) for: $url";
}
my $rsh = "/usr/bin/ssh $ssh_options " . $ssh_user . '@' . $ssh_host;
return ($rsh, $file); return ($rsh, $file);
} }
return ("", $url); return ("", $url);
@ -974,6 +983,7 @@ MAIN:
exit 1; exit 1;
} }
INFO "$version_info (" . localtime($start_time) . ")";
if($action_diff) if($action_diff)
{ {
@ -1445,7 +1455,7 @@ MAIN:
} }
my $time_elapsed = time - $start_time; my $time_elapsed = time - $start_time;
INFO "Completed within: ${time_elapsed}s"; INFO "Completed within: ${time_elapsed}s (" . localtime(time) . ")";
# #
# print summary # print summary