ebl fix javascript

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

diff --git a/gui/bweb/lib/Bconsole.pm b/gui/bweb/lib/Bconsole.pm
index 9379657ce9969feced4f940eb6cae6641fe13c39..f612d6e32d7db7c1dea9e65e03701811668805e4 100644 (file)
--- a/gui/bweb/lib/Bconsole.pm
+++ b/gui/bweb/lib/Bconsole.pm
@@ -147,7 +147,10 @@ sub connect
        { 
            my $sav = $SIG{__DIE__};
            $SIG{__DIE__} = sub {  _exit 1 ;};
+            my $old = $ENV{COLUMNS};
+            $ENV{COLUMNS} = 300;
            $ret = $self->{bconsole}->spawn(@cmd) ;
+            $ENV{COLUMNS} = $old;
            $SIG{__DIE__} = $sav;
        }
 
@@ -228,7 +231,7 @@ sub label_barcodes
     }
 
     $self->send("$cmd\n");
-    $self->expect_it('-re', '[?].+\)\s*:');
+    $self->expect_it('-re', '[?].+\).*:');
     my $res = $self->before();
     $self->send("yes\n");
     $self->expect_it("yes");