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 f612d6e32d7db7c1dea9e65e03701811668805e4..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;
 }
@@ -122,6 +121,16 @@ sub log_stdout
     $self->{log_stdout} = $how;
 }
 
+sub error
+{
+    my ($self, $error) = @_;
+    $self->{error} = $error;
+    if ($error) {
+       print STDERR "E: bconsole (", $self->{pref}->{bconsole}, ") $! $error\n";
+    }
+    return 0;
+}
+
 sub connect
 {
     my ($self) = @_;
@@ -133,8 +142,7 @@ sub connect
     unless ($self->{bconsole}) {
        my @cmd = split(/\s+/, $self->{pref}->{bconsole}) ;
        unless (@cmd) {
-           $self->{error} = "bconsole string not found";
-           return 0;
+           return $self->error("bconsole string not found");
        }
        $self->{bconsole} = new Expect;
        $self->{bconsole}->raw_pty(0);
@@ -150,13 +158,13 @@ sub connect
             my $old = $ENV{COLUMNS};
             $ENV{COLUMNS} = 300;
            $ret = $self->{bconsole}->spawn(@cmd) ;
-            $ENV{COLUMNS} = $old;
+           delete $ENV{COLUMNS};
+           $ENV{COLUMNS} = $old if ($old) ;
            $SIG{__DIE__} = $sav;
        }
 
        unless ($ret) {
-           $self->{error} = $!;
-           return 0;
+           return $self->error($self->{bconsole}->error());
        }
        
        # TODO : we must verify that expect return the good value
@@ -352,7 +360,7 @@ sub _get_volume
            $sel .= " volume=$1";
 
        } else {
-           $self->{error} = "Sorry media is bad";
+           $self->error("Sorry media is bad");
            return '';
        }
     }
@@ -362,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");
@@ -376,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");
@@ -400,8 +408,7 @@ sub purge_job
            $sel .= " jobid=$1";
 
        } else {
-           $self->{error} = "Sorry jobid is bad";
-           return 0;
+           return $self->error("Sorry jobid is bad");
        }
     }