ebl Add role checks for media

[bacula/bacula] / gui / bweb / lib / Bconsole.pm

diff --git a/gui/bweb/lib/Bconsole.pm b/gui/bweb/lib/Bconsole.pm
index 8fbe1de763948140f33fb7abc89041abe19d594e..45ec5d4183c0ce8c5952a92985d0ad2643c7aea0 100644 (file)
--- a/gui/bweb/lib/Bconsole.pm
+++ b/gui/bweb/lib/Bconsole.pm
@@ -105,8 +105,7 @@ sub expect_it
 {
     my ($self, @what) = @_;
     unless ($self->{bconsole}->expect($self->{timeout}, @what)) {
-       $self->{error} = $!;
-       return 0;
+       return $self->error($self->{bconsole}->error());
     }
     return 1;
 }
@@ -125,9 +124,9 @@ sub log_stdout
 sub error
 {
     my ($self, $error) = @_;
-    $self->{error} = $!;
-    if ($self->{debug}) {
-       print "E: bconsole (", $self->{pref}->{bconsole}, ") $!\n";
+    $self->{error} = $error;
+    if ($error) {
+       print STDERR "E: bconsole (", $self->{pref}->{bconsole}, ") $! $error\n";
     }
     return 0;
 }
@@ -165,7 +164,7 @@ sub connect
        }
 
        unless ($ret) {
-           return $self->error($ret);
+           return $self->error($self->{bconsole}->error());
        }
        
        # TODO : we must verify that expect return the good value
@@ -371,9 +370,9 @@ sub _get_volume
 
 sub purge_volume
 {
-    my ($self, @volume) = @_;
+    my ($self, $volume) = @_;
 
-    my $sel = $self->_get_volume(@volume);
+    my $sel = $self->_get_volume($volume);
     my $ret;
     if ($sel) {
        $ret = $self->send_cmd("purge $sel");
@@ -385,9 +384,9 @@ sub purge_volume
 
 sub prune_volume
 {
-    my ($self, @volume) = @_;
+    my ($self, $volume) = @_;
 
-    my $sel = $self->_get_volume(@volume);
+    my $sel = $self->_get_volume($volume);
     my $ret;
     if ($sel) {
        $ret = $self->send_cmd("prune $sel yes");