Imported Upstream version 3.3.3

[debian/amanda] / installcheck / mock / mtx.pl

diff --git a/installcheck/mock/mtx.pl b/installcheck/mock/mtx.pl
index b8dce83354bd30cec8678c57cd9c849a17601b96..35c19f62a3177fe896df59d3dd316b131cf8e75c 100644 (file)
--- a/installcheck/mock/mtx.pl
+++ b/installcheck/mock/mtx.pl
@@ -1,9 +1,10 @@
 #! @PERL@
-# Copyright (c) 2009 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
@@ -81,7 +82,7 @@ sub load_statefile {
     }
 
     # make sure some things are zero if they're not defined
-    for my $k qw(num_drives num_slots num_ie first_drive first_slot first_ie) {
+    for my $k (qw(num_drives num_slots num_ie first_drive first_slot first_ie)) {
        $CONFIG->{$k} = 0 unless defined $CONFIG->{$k};
     }
 }