Imported Upstream version 3.3.3

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

diff --git a/perl/Amanda/Changer/aggregate.pm b/perl/Amanda/Changer/aggregate.pm
index 4f59be32df866c38be550cacd00f6d4cbe9264d2..fa0fd89a0f60c0855ba6f0d86f33058b2b58459f 100644 (file)
--- a/perl/Amanda/Changer/aggregate.pm
+++ b/perl/Amanda/Changer/aggregate.pm
@@ -1,8 +1,9 @@
 # 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
@@ -92,6 +93,7 @@ sub new {
 
     my $state_filename;
     my $state_filename_prop = $config->{'properties'}->{'state_filename'};
+    my $lock_timeout = $config->{'properties'}->{'lock-timeout'};
 
     if (defined $state_filename_prop) {
        $state_filename = $state_filename_prop->{'values'}[0];
@@ -107,6 +109,7 @@ sub new {
        num_children => scalar @children,
        current_slot => undef,
        state_filename => $state_filename,
+       'lock-timeout' => $lock_timeout,
     };
     bless ($self, $class);
     return $self;