Imported Upstream version 3.3.3

[debian/amanda] / perl / Amanda / Changer / rait.pm

diff --git a/perl/Amanda/Changer/rait.pm b/perl/Amanda/Changer/rait.pm
index 26486bc495ce99d5e9c0a92feccb55cf8e2b8e75..5741c773721485a31c4cdb9d3cb3a6ba82976910 100644 (file)
--- a/perl/Amanda/Changer/rait.pm
+++ b/perl/Amanda/Changer/rait.pm
@@ -1,8 +1,9 @@
-# Copyright (c) 2009,2010 Zmanda, Inc.  All Rights Reserved.
+# Copyright (c) 2009-2012 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
-# 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 program is distributed in the hope that it will be useful, but
 # WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
@@ -20,6 +21,7 @@ package Amanda::Changer::rait;
 
 use strict;
 use warnings;
+use Carp;
 use vars qw( @ISA );
 @ISA = qw( Amanda::Changer );
 
@@ -525,7 +527,7 @@ sub _for_each_child {
        ($params{'oksub'}, $params{'errsub'}, $params{'parent_cb'}, $params{'args'});
 
     if (defined($args)) {
-       die "number of args did not match number of children"
+       confess "number of args did not match number of children"
            unless (@$args == $self->{'num_children'});
     } else {
        $args = [ ( undef ) x $self->{'num_children'} ];