projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.2.0
[debian/amanda]
/
application-src
/
amsuntar.pl
diff --git
a/application-src/amsuntar.pl
b/application-src/amsuntar.pl
index 38ba67856a3c64b05a17753097266cdacc20493e..a2747572a367407b45ed096e52d926c07935fde7 100755
(executable)
--- a/
application-src/amsuntar.pl
+++ b/
application-src/amsuntar.pl
@@
-1,5
+1,5
@@
#!@PERL@
#!@PERL@
-# Copyright (c) 2009 Zmanda, Inc. All Rights Reserved.
+# Copyright (c) 2009
, 2010
Zmanda, Inc. All Rights Reserved.
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as published
#
# This program is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License version 2 as published
@@
-19,6
+19,7
@@
use lib '@amperldir@';
use strict;
use lib '@amperldir@';
use strict;
+use warnings;
use Getopt::Long;
package Amanda::Application::Amsuntar;
use Getopt::Long;
package Amanda::Application::Amsuntar;
@@
-226,11
+227,6
@@
sub command_backup {
my $self = shift;
$self->validate_inexclude();
my $self = shift;
$self->validate_inexclude();
- my $mesgout_fd;
- open($mesgout_fd, '>&=3') ||
- $self->print_to_server_and_die("Can't open mesgout_fd: $!",
- $Amanda::Script_App::ERROR);
- $self->{mesgout} = $mesgout_fd;
my(@cmd) = $self->build_command();
my(@cmdtc) = $self->{teecount};
my(@cmd) = $self->build_command();
my(@cmdtc) = $self->{teecount};
@@
-258,11
+254,11
@@
sub command_backup {
open($indexout_fd, '>&=4') ||
$self->print_to_server_and_die("Can't open indexout_fd: $!",
$Amanda::Script_App::ERROR);
open($indexout_fd, '>&=4') ||
$self->print_to_server_and_die("Can't open indexout_fd: $!",
$Amanda::Script_App::ERROR);
- $result = $self->parse_backup($index_fd, $
mesgout_fd
, $indexout_fd);
+ $result = $self->parse_backup($index_fd, $
self->{mesgout}
, $indexout_fd);
close($indexout_fd);
}
else {
close($indexout_fd);
}
else {
- $result = $self->parse_backup($index_fd, $
mesgout_fd
, undef);
+ $result = $self->parse_backup($index_fd, $
self->{mesgout}
, undef);
}
close($index_fd);
my $size = <$errtc>;
}
close($index_fd);
my $size = <$errtc>;
@@
-276,12
+272,13
@@
sub command_backup {
if ($result == 1) {
debug("$self->{suntar} returned error" );
if ($result == 1) {
debug("$self->{suntar} returned error" );
- print $mesgout_fd "sendbackup: error [$self->{suntar} returned error]\n";
+ $self->print_to_server("$self->{suntar} returned error",
+ $Amanda::Script_App::ERROR);
}
my($ksize) = int ($size/1024);
}
my($ksize) = int ($size/1024);
- print
$mesgout_fd
"sendbackup: size $ksize\n";
- print
$mesgout_fd
"sendbackup: end\n";
+ print
{$self->{mesgout}}
"sendbackup: size $ksize\n";
+ print
{$self->{mesgout}}
"sendbackup: end\n";
debug("sendbackup: size $ksize ");
exit 0;
debug("sendbackup: size $ksize ");
exit 0;