diff --git a/ChangeLog b/ChangeLog index 4025b7b..a210565 100644 --- a/ChangeLog +++ b/ChangeLog @@ -8,6 +8,8 @@ btrbk-current * Added configuration options "raw_target_compress_level", "raw_target_compress_threads" (close: #60). * Added "stats" command (close: #54). + * Print "$hostname:$path" instead of "{$hostname}$path" in summary + and logs. btrbk-0.21.0 diff --git a/btrbk b/btrbk index 5b288d5..050bce0 100755 --- a/btrbk +++ b/btrbk @@ -418,7 +418,7 @@ sub vinfo($$) %info, HOST => $host, PATH => $path, - PRINT => "{$host}$path", + PRINT => "$host:$path", RSH_TYPE => "ssh", SSH_USER => $ssh_user, SSH_IDENTITY => $ssh_identity, @@ -2314,9 +2314,6 @@ MAIN: elsif(/^(?$ip_addr_match|$host_name_match):\/(?$file_match)$/) { # convert "my.host.com:/my/path" to ssh url $_ = "ssh://$+{host}/$+{file}"; } - elsif(/^\{(?$ip_addr_match|$host_name_match)\}\/(?$file_match)$/) { # convert "{my.host.com}/my/path" to ssh url - $_ = "ssh://$+{host}/$+{file}"; - } else { ERROR "Bad argument: not a subvolume" . ($args_allow_group ? "/group" : "") . " declaration: $_"; HELP_MESSAGE(0); diff --git a/doc/btrbk.1 b/doc/btrbk.1 index 8d13213..784fd9b 100644 --- a/doc/btrbk.1 +++ b/doc/btrbk.1 @@ -263,8 +263,8 @@ Matches the \fIgroup\fR configuration option of a \fIvolume\fR, \fIsubvolume\fR or \fItarget\fR section. .RE .PP -For convenience, [hostname:] can be specified as either "hostname:", -"{hostname}" or "ssh://hostname/". +For convenience, [hostname:] can be specified as either "hostname:" or +"ssh://hostname/". .SH FILES .PP /etc/btrbk.conf