X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=perl%2FAmanda%2FScanInventory.pm;fp=perl%2FAmanda%2FScanInventory.pm;h=235d2fb9047d33c811f4d21023fe3977e1e2bd0f;hb=691567b16c13087b31ee4c2b6d038e57872fae82;hp=f5d4d7b12a95601ed05a43f8df9df0d799907710;hpb=cc7d7b45afc706099acf7ff2490ec5667d370651;p=debian%2Famanda diff --git a/perl/Amanda/ScanInventory.pm b/perl/Amanda/ScanInventory.pm index f5d4d7b..235d2fb 100644 --- a/perl/Amanda/ScanInventory.pm +++ b/perl/Amanda/ScanInventory.pm @@ -1,8 +1,9 @@ # Copyright (c) 2010-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 @@ -575,6 +576,7 @@ sub volume_is_labelable { if (!$autolabel->{'other_config'}) { $self->_user_msg(slot_result => 1, label => $label, + labelstr => $self->{'labelstr'}, does_not_match_labelstr => 1, slot => $slot); return 0;