diff options
author | Maarten Vanraes <alien@mageia.org> | 2016-08-06 14:44:18 +0200 |
---|---|---|
committer | Maarten Vanraes <alien@mageia.org> | 2016-08-07 17:13:14 +0200 |
commit | 006398d5a14e325cd1f0f9a0fb61625533a7aec1 (patch) | |
tree | b84c267053050b5c484a38855969f2360644b018 | |
parent | f80cca11459177337dd660a98d95388da8010cb3 (diff) | |
download | manatools-006398d5a14e325cd1f0f9a0fb61625533a7aec1.tar manatools-006398d5a14e325cd1f0f9a0fb61625533a7aec1.tar.gz manatools-006398d5a14e325cd1f0f9a0fb61625533a7aec1.tar.bz2 manatools-006398d5a14e325cd1f0f9a0fb61625533a7aec1.tar.xz manatools-006398d5a14e325cd1f0f9a0fb61625533a7aec1.zip |
Swap: fix bug where ordered children without first are empty
-rw-r--r-- | lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm b/lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm index fc3e51cb..ba54ae38 100644 --- a/lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm +++ b/lib/ManaTools/Shared/disk_backend/Plugin/Swap.pm @@ -91,6 +91,7 @@ has '+tools' => ( #============================================================= override ('probe', sub { my $self = shift; + $self->D('probing for swap'); # check current swaps and create a Swap Part for each one # TODO: find the in device (create if needed?) open F, '</proc/swaps' or return 0; @@ -98,6 +99,7 @@ override ('probe', sub { <F>; while (my $line = <F>) { my @fields = split(/[ \t\r\n]+/, $line); + $self->D('in swap list, finding %s', $fields[0]); # look or create the part my $part = $self->parent->trypart(ManaTools::Shared::disk_backend::Part->CurrentState, sub { @@ -105,6 +107,7 @@ override ('probe', sub { my $parameters = shift; return ($part->path() eq $parameters->{path}); }, 'Swap', {path => $fields[0], plugin => $self, loaded => undef, saved => undef}); + $self->D("part $part: finding parent: "); # look for the parent part if not set if (!$part->has_link(undef, 'parent')) { @@ -115,8 +118,11 @@ override ('probe', sub { my $major = int (($dev - $minor) / 256); my @parents = $self->parent->findpartprop(undef, 'dev', $major .':'. $minor); $part->add_taglink($parents[0], 'parent') if (scalar(@parents) > 0); + $self->D("part $part: found a parent: $parents[0] with ". $parents[0]->label()); + my @children = $parents[0]->children(); } } + # TODO: make sure order is correct $part->prop('filename', $fields[0]); $part->prop('swaptype', $fields[1]); |