Imported Upstream version 3.3.1

[debian/amanda] / client-src / amdump_client.pl

diff --git a/client-src/amdump_client.pl b/client-src/amdump_client.pl
index 672c25927b27d000fc2bd3354706dafcc07f2898..560747c7d82e51f39c83506244cf6d425e323f39 100644 (file)
--- a/client-src/amdump_client.pl
+++ b/client-src/amdump_client.pl
@@ -28,15 +28,18 @@ use IPC::Open3;
 use Amanda::Util qw( :constants );
 use Amanda::Config qw( :init :getconf );
 use Amanda::Paths;
-use Amanda::Logfile qw( log_rename get_current_log_timestamp $amanda_log_trace_log );
+use Amanda::Util qw ( match_disk );
 use Amanda::Debug qw( debug );
 
 Amanda::Util::setup_application("amdump_client", "client", $CONTEXT_CMDLINE);
 
 my $config;
 my $config_overrides = new_config_overrides($#ARGV+1);
+
+debug("Arguments: " . join(' ', @ARGV));
 Getopt::Long::Configure(qw{bundling});
 GetOptions(
+    'version' => \&Amanda::Util::version_opt,
     'config=s' => sub { $config = $_[1]; },
     'o=s' => sub { add_config_override_opt($config_overrides, $_[1]); },
 ) or usage();
@@ -94,7 +97,7 @@ if ($cmd eq 'list') {
         #find the diskname that match
        for (my $i=1; $i <= $#ARGV; $i++) {
            for my $diskname (@disks) {
-               if (Amanda::Logfile::match_disk($ARGV[$i], $diskname)) {
+               if (match_disk($ARGV[$i], $diskname)) {
                    debug("send: DISK " . Amanda::Util::quote_string($diskname));
                    print {$amservice_in} "DISK " . Amanda::Util::quote_string($diskname) . "\n";
                    my $a = <$amservice_out>;
@@ -117,7 +120,7 @@ if ($cmd eq 'list') {
         #find the diskname that match
        for (my $i=1; $i <= $#ARGV; $i++) {
            for my $diskname (@disks) {
-               if (Amanda::Logfile::match_disk($ARGV[$i], $diskname)) {
+               if (match_disk($ARGV[$i], $diskname)) {
                    debug("send: DISK " . Amanda::Util::quote_string($diskname));
                    print {$amservice_in} "DISK " . Amanda::Util::quote_string($diskname) . "\n";
                    my $a = <$amservice_out>;