- }
- close $dh;
- my %pids;
- if (@parts) {
- my $pid = spawn([ qw(xapian-compact), @parts, "$new/0" ]);
- defined $pid or die "compact failed: $?\n";
- $pids{$pid} = 'xapian-compact (parts)';
- } else {
- warn "No parts found in $xroot\n";
- }
- if (defined $skel) {
- my $pid = spawn([ qw(xapian-compact), $skel, "$new/skel" ]);
- defined $pid or die "compact failed: $?\n";
- $pids{$pid} = 'xapian-compact (skel)';
- } else {
- warn "$xroot/skel missing\n";
- }
- die "No xapian-compact processes running\n" unless scalar keys %pids;
- while (scalar keys %pids) {
- my $pid = waitpid(-1, 0);
- my $desc = delete $pids{$pid};
- die "$desc failed: $?\n" if $?;
- }
- rename($xroot, "$new/old") or die "rename $xroot => $new/old: $!\n";
- rename($new, $xroot) or die "rename $new => $xroot: $!\n";
- $v2w->lock_release;
- remove_tree("$xroot/old") or die "failed to remove $xroot/old: $!\n";
+ close $dh;
+ die "No Xapian parts found in $old\n" unless keys %pids;
+ while (scalar keys %pids) {
+ my $pid = waitpid(-1, 0);
+ my $desc = delete $pids{$pid};
+ die "$desc failed: $?\n" if $?;
+ }
+ commit_changes($v2w, $old, $new);
+ });