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

btrbk: bugfix: fix checks on "btrfs sub show" output, which resulted in breakage on btrfs-progs < 4.1

pull/73/head
Axel Burri 2016-02-01 17:05:12 +01:00
parent d3990bcc90
commit 6f66f72c26
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
btrbk-current
* Bugfix: fix checks on "btrfs sub show" output, which resulted in
breakage on btrfs-progs < 4.1 (close: #68).
btrbk-0.22.1 btrbk-0.22.1
* Support for btrfs-progs v4.4 (close: #66). * Support for btrfs-progs v4.4 (close: #66).

7
btrbk
View File

@ -48,7 +48,7 @@ use Getopt::Long qw(GetOptions);
use POSIX qw(strftime); use POSIX qw(strftime);
use Data::Dumper; use Data::Dumper;
our $VERSION = "0.22.1"; our $VERSION = "0.22.2-dev";
our $AUTHOR = 'Axel Burri <axel@tty0.ch>'; our $AUTHOR = 'Axel Burri <axel@tty0.ch>';
our $PROJECT_HOME = '<http://www.digint.ch/btrbk/>'; our $PROJECT_HOME = '<http://www.digint.ch/btrbk/>';
@ -987,6 +987,8 @@ sub btrfs_filesystem_usage($)
} }
# returns hashref with keys: (name uuid parent_uuid id gen cgen top_level)
# for btrfs-progs >= 4.1, also returns key: "received_uuid"
sub btrfs_subvolume_detail($) sub btrfs_subvolume_detail($)
{ {
my $vol = shift || die; my $vol = shift || die;
@ -1042,8 +1044,9 @@ sub btrfs_subvolume_detail($)
} }
elsif($ret =~ /^$real_path/) { elsif($ret =~ /^$real_path/) {
TRACE "btr_detail: found btrfs subvolume: $vol->{PRINT}"; TRACE "btr_detail: found btrfs subvolume: $vol->{PRINT}";
# NOTE: received_uuid is not required here, as btrfs-progs < 4.1 does not give us that information.
# no worries, we get this from btrfs_subvolume_list() for all subvols.
my @required_keys = qw(name uuid parent_uuid id gen cgen top_level); my @required_keys = qw(name uuid parent_uuid id gen cgen top_level);
push(@required_keys, "received_uuid") unless($vol->{BTRFS_PROGS_COMPAT});
my %trans = ( my %trans = (
"Name" => "name", "Name" => "name",
"uuid" => "uuid", "uuid" => "uuid",