Imported Upstream version 3.2.1

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

diff --git a/server-src/amlabel.pl b/server-src/amlabel.pl
index d2fd4fdafdaa7ed7ac03086c97c943a6aac0db19..f9103b8cb1f0d06cbadf0d5257d8376dc60fdeb4 100644 (file)
--- a/server-src/amlabel.pl
+++ b/server-src/amlabel.pl
@@ -42,8 +42,7 @@ my $exit_status = 0;
 my %subcommands;
 
 sub usage {
-    print STDERR "Usage: amlabel <conf> <label> [slot <slot-number>] "
-              . "[-f] [-o configoption]*\n";
+    print STDERR "Usage: amlabel [-f] [-o configoption]* <conf> <label> [slot <slot-number>]\n";
     exit(1);
 }
 
@@ -219,7 +218,7 @@ sub main {
            # update the tapelist
            $tl->reload(1);
            $tl->remove_tapelabel($opt_label);
-           $tl->add_tapelabel("0", $opt_label, undef, 1);
+           $tl->add_tapelabel("0", $opt_label, undef, 1, undef, $res->{'barcode'});
            $tl->write();
 
            print "Success!\n";