projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 3.3.2
[debian/amanda]
/
perl
/
Amanda
/
Changer
/
disk.pm
diff --git
a/perl/Amanda/Changer/disk.pm
b/perl/Amanda/Changer/disk.pm
index 8172791db08fbe14824dd13cd39c613c01151f36..8c18e65ce91d6a32e78c8153d274390c9c4c4397 100644
(file)
--- a/
perl/Amanda/Changer/disk.pm
+++ b/
perl/Amanda/Changer/disk.pm
@@
-1,4
+1,4
@@
-# Copyright (c) 2008
,2009,2010
Zmanda, Inc. All Rights Reserved.
+# Copyright (c) 2008
-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
#
# 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
@@
-20,6
+20,7
@@
package Amanda::Changer::disk;
use strict;
use warnings;
use strict;
use warnings;
+use Carp;
use vars qw( @ISA );
@ISA = qw( Amanda::Changer );
use vars qw( @ISA );
@ISA = qw( Amanda::Changer );
@@
-497,7
+498,7
@@
sub _get_slot_label {
sub _load_drive {
my ($self, $drive, $slot) = @_;
sub _load_drive {
my ($self, $drive, $slot) = @_;
-
die
"'$drive' does not exist" unless (-d $drive);
+
confess
"'$drive' does not exist" unless (-d $drive);
if (-e "$drive/data") {
unlink("$drive/data");
}
if (-e "$drive/data") {
unlink("$drive/data");
}