Merge tag 'upstream/3.3.3'

[debian/amanda] / perl / Amanda / Script.pm

diff --git a/perl/Amanda/Script.pm b/perl/Amanda/Script.pm
index 3e96dfefcae0c583b2316ad45bdc0b994cfc906b..9d88393c36c8917b149547372c572313dce2aa34 100644 (file)
--- a/perl/Amanda/Script.pm
+++ b/perl/Amanda/Script.pm
@@ -1,21 +1,22 @@
 # vim:ft=perl
-# Copyright (c) 2005-2008 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2008-2012 Zmanda, Inc.  All Rights Reserved.
 #
-# This library is free software; you can redistribute it and/or modify it
-# under the terms of the GNU Lesser General Public License version 2.1 as
-# published by the Free Software Foundation.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 #
-# This library is distributed in the hope that it will be useful, but
+# This program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public
-# License for more details.
+# or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+# for more details.
 #
-# You should have received a copy of the GNU Lesser General Public License
-# along with this library; if not, write to the Free Software Foundation,
-# Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA.
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
 #
-# Contact information: Zmanda Inc., 465 S Mathlida Ave, Suite 300
-# Sunnyvale, CA 94086, USA, or: http://www.zmanda.com
+# Contact information: Zmanda Inc., 465 S. Mathilda Ave., Suite 300
+# Sunnyvale, CA 94085, USA, or: http://www.zmanda.com
 
 package Amanda::Script;
 use base qw(Amanda::Script_App);
@@ -59,23 +60,29 @@ Amanda::Script - perl utility functions for Scripts.
 
 sub new {
     my $class = shift;
-    my $execute_where = shift;
+    my ($execute_where, $config_name) = @_;
 
-    my $self = Amanda::Script_App::new($class, $execute_where, "script", @_);
+    my $self = Amanda::Script_App::new($class, $execute_where, "script", $config_name);
 
     $self->{known_commands} = {
         support             => 1,
+        pre_amcheck         => 1,
         pre_dle_amcheck     => 1,
         pre_host_amcheck    => 1,
+        post_amcheck        => 1,
         post_dle_amcheck    => 1,
         post_host_amcheck   => 1,
         pre_dle_estimate    => 1,
+        pre_estimate        => 1,
         pre_host_estimate   => 1,
+        post_estimate       => 1,
         post_dle_estimate   => 1,
         post_host_estimate  => 1,
+        pre_backup          => 1,
         pre_dle_backup      => 1,
         pre_host_backup     => 1,
         post_dle_backup     => 1,
+        post_backup         => 1,
         post_host_backup    => 1,
         pre_recover         => 1,
         post_recover        => 1,
@@ -86,5 +93,12 @@ sub new {
     return $self;
 }
 
+sub _set_mesgout {
+    my $self = shift;
+
+    my $mesgout_fd;
+    open ($mesgout_fd, '>&=1') || die("Can't open mesgout_fd: $!");
+    $self->{mesgout} = $mesgout_fd;
+}
 
 1;