Blame amanda-3.1-amrestore.patch
|
Jan Görig |
b957de |
diff --git a/server-src/amrestore.pl b/server-src/amrestore.pl
|
|
Jan Görig |
b957de |
index dfe521a..d3284ed 100755
|
|
Jan Görig |
b957de |
--- a/server-src/amrestore.pl
|
|
Jan Görig |
b957de |
+++ b/server-src/amrestore.pl
|
|
Jan Görig |
b957de |
@@ -372,13 +372,14 @@ sub main {
|
|
Jan Görig |
b957de |
my ($err) = @_;
|
|
Jan Görig |
b957de |
return failure($err, $finished_cb) if $err;
|
|
Jan Görig |
b957de |
|
|
Jan Görig |
b957de |
- $steps->{'next_file'}->();
|
|
Jan Görig |
b957de |
+ $steps->{'next_file'}->('extracted');
|
|
Jan Görig |
b957de |
};
|
|
Jan Görig |
b957de |
|
|
Jan Görig |
b957de |
step next_file => sub {
|
|
Jan Görig |
b957de |
- # amrestore does not loop over multiple files when reading from
|
|
Jan Görig |
b957de |
- # holding or when outputting to a pipe
|
|
Jan Görig |
b957de |
- if ($opt_holding or $opt_pipe) {
|
|
Jan Görig |
b957de |
+ my ($extracted) = @_;
|
|
Jan Görig |
b957de |
+ # amrestore does not loop over multiple files when reading from holding
|
|
Jan Görig |
b957de |
+ # when outputting to a pipe amrestore extracts only the first file
|
|
Jan Görig |
b957de |
+ if ($opt_holding or ($opt_pipe and $extracted)) {
|
|
Jan Görig |
b957de |
return $steps->{'finished'}->();
|
|
Jan Görig |
b957de |
}
|
|
Jan Görig |
b957de |
|