Imported Upstream version 3.3.0

[debian/amanda] / perl / Amanda / Recovery / Clerk.pm

diff --git a/perl/Amanda/Recovery/Clerk.pm b/perl/Amanda/Recovery/Clerk.pm
index 1c462aca4ab02ea3826d98d86e7c7763af5915aa..810621f792d1a6ce7b81494ad0f0f1c9b16ac975 100644 (file)
--- a/perl/Amanda/Recovery/Clerk.pm
+++ b/perl/Amanda/Recovery/Clerk.pm
@@ -300,18 +300,25 @@ sub handle_xmsg {
 sub quit {
     my $self = shift;
     my %params = @_;
+    my $finished_cb = $params{'finished_cb'};
 
     die "Cannot quit a Clerk while a transfer is in progress"
        if $self->{'xfer_state'};
 
-    # if we have a reservation, we need to release it; otherwise, we can
-    # just call finished_cb
-    if ($self->{'current_res'}) {
-       $self->{'current_dev'}->finish();
-       $self->{'current_res'}->release(finished_cb => $params{'finished_cb'});
-    } else {
-       $params{'finished_cb'}->();
-    }
+    my $steps = define_steps 
+       cb_ref => \$finished_cb,
+       finalize => sub { $self->{'scan'}->quit() if defined $self->{'scan'} };
+
+    step release => sub {
+       # if we have a reservation, we need to release it; otherwise, we can
+       # just call finished_cb
+       if ($self->{'current_res'}) {
+           $self->{'current_dev'}->finish();
+           $self->{'current_res'}->release(finished_cb => $finished_cb);
+       } else {
+           $finished_cb->();
+       }
+    };
 }
 
 sub _xmsg_ready {