From 53d5536929b89b752acc64049f6e087f500e9e95 Mon Sep 17 00:00:00 2001 From: Axel Burri Date: Sat, 12 Dec 2020 20:09:57 +0100 Subject: [PATCH] btrbk: fix fs_path Fixes action "origin" and logging. Regression: cc3f6c95b9 btrbk: return array in _fs_path --- btrbk | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/btrbk b/btrbk index d173770..4cf2a70 100755 --- a/btrbk +++ b/btrbk @@ -2702,12 +2702,15 @@ sub _fs_info my $node = shift // die; my $url_prefix = shift // $node->{TREE_ROOT}{URL_PREFIX}; my @ret = __fs_info($node, $url_prefix); - return scalar(@ret) ? @ret : ({ path => "$url_prefix<$node->{TREE_ROOT}{mount_source}>/$node->{path}", mountinfo => undef }); + @ret = ({ path => "$url_prefix<$node->{TREE_ROOT}{mount_source}>/$node->{path}", + mountinfo => undef }) unless(scalar(@ret)); + return @ret; } sub _fs_path { - return map $_->{path}, _fs_info(@_); + my @ret = map $_->{path}, _fs_info(@_); + return wantarray ? @ret : $ret[0]; }