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

btrbk: print "$hostname:$path" instead of "{$hostname}$path" in summary and logs

pull/65/head
Axel Burri 2016-01-17 19:44:59 +01:00
parent 8a29ced0c9
commit a1698ef4b0
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -8,6 +8,8 @@ btrbk-current
* Added configuration options "raw_target_compress_level", * Added configuration options "raw_target_compress_level",
"raw_target_compress_threads" (close: #60). "raw_target_compress_threads" (close: #60).
* Added "stats" command (close: #54). * Added "stats" command (close: #54).
* Print "$hostname:$path" instead of "{$hostname}$path" in summary
and logs.
btrbk-0.21.0 btrbk-0.21.0

5
btrbk
View File

@ -418,7 +418,7 @@ sub vinfo($$)
%info, %info,
HOST => $host, HOST => $host,
PATH => $path, PATH => $path,
PRINT => "{$host}$path", PRINT => "$host:$path",
RSH_TYPE => "ssh", RSH_TYPE => "ssh",
SSH_USER => $ssh_user, SSH_USER => $ssh_user,
SSH_IDENTITY => $ssh_identity, SSH_IDENTITY => $ssh_identity,
@ -2314,9 +2314,6 @@ MAIN:
elsif(/^(?<host>$ip_addr_match|$host_name_match):\/(?<file>$file_match)$/) { # convert "my.host.com:/my/path" to ssh url elsif(/^(?<host>$ip_addr_match|$host_name_match):\/(?<file>$file_match)$/) { # convert "my.host.com:/my/path" to ssh url
$_ = "ssh://$+{host}/$+{file}"; $_ = "ssh://$+{host}/$+{file}";
} }
elsif(/^\{(?<host>$ip_addr_match|$host_name_match)\}\/(?<file>$file_match)$/) { # convert "{my.host.com}/my/path" to ssh url
$_ = "ssh://$+{host}/$+{file}";
}
else { else {
ERROR "Bad argument: not a subvolume" . ($args_allow_group ? "/group" : "") . " declaration: $_"; ERROR "Bad argument: not a subvolume" . ($args_allow_group ? "/group" : "") . " declaration: $_";
HELP_MESSAGE(0); HELP_MESSAGE(0);

4
doc/btrbk.1
View File

@ -263,8 +263,8 @@ Matches the \fIgroup\fR configuration option of a \fIvolume\fR,
\fIsubvolume\fR or \fItarget\fR section. \fIsubvolume\fR or \fItarget\fR section.
.RE .RE
.PP .PP
For convenience, [hostname:] can be specified as either "hostname:", For convenience, [hostname:] can be specified as either "hostname:" or
"{hostname}" or "ssh://hostname/". "ssh://hostname/".
.SH FILES .SH FILES
.PP .PP
/etc/btrbk.conf /etc/btrbk.conf