Imported Upstream version 3.2.0

[debian/amanda] / server-src / amlabel.pl

diff --git a/server-src/amlabel.pl b/server-src/amlabel.pl
index e9920dba2af94ec5eb9f56545290daa0666ef1d2..d2fd4fdafdaa7ed7ac03086c97c943a6aac0db19 100644 (file)
--- a/server-src/amlabel.pl
+++ b/server-src/amlabel.pl
@@ -19,6 +19,7 @@
 
 use lib '@amperldir@';
 use strict;
+use warnings;
 
 use File::Basename;
 use Getopt::Long;
@@ -113,7 +114,7 @@ sub main {
        }
 
        $tlf = Amanda::Config::config_dir_relative(getconf($CNF_TAPELIST));
-       $tl = Amanda::Tapelist::read_tapelist($tlf);
+       $tl = Amanda::Tapelist->new($tlf);
        if (!defined $tl) {
            return failure("Can't load tapelist file ($tlf)", $finished_cb);
        }
@@ -216,16 +217,17 @@ sub main {
            }
 
            # update the tapelist
+           $tl->reload(1);
            $tl->remove_tapelabel($opt_label);
-           $tl->add_tapelabel("0", $opt_label, undef);
-           $tl->write($tlf);
+           $tl->add_tapelabel("0", $opt_label, undef, 1);
+           $tl->write();
 
            print "Success!\n";
 
            # notify the changer
            $res->set_label(label => $opt_label, finished_cb => $steps->{'labeled'});
        } else {
-           return failure("Volume not labeled.", $finished_cb);
+           return failure("Not writing label.", $finished_cb);
        }
     };