ebl Fix a Bconsole.pm with Expect bug on debian lenny

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@7988 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/gui/bweb/lib/Bconsole.pm b/gui/bweb/lib/Bconsole.pm
index 9344e547e59871aab794b4bf214fc3d3fdded3af..96b6e1018bac6b21393f0d3158191a98ed167fa5 100644 (file)
--- a/gui/bweb/lib/Bconsole.pm
+++ b/gui/bweb/lib/Bconsole.pm
@@ -88,7 +88,7 @@ sub run
     print STDERR "===> $cmd $go\n";
     $self->{bconsole}->clear_accum();
     $self->send("$cmd $go\n");
-    $self->expect_it('-re',qr/^[*]/);
+    $self->expect_it('-re','^[*]');
     my $ret = $self->before();
     if ($ret =~ /jobid=(\d+)/is) {
        return $1;
@@ -207,7 +207,7 @@ sub send_cmd
     $self->{bconsole}->clear_accum();
     $self->send("$cmd\n");
 #    $self->expect_it($cmd);
-    $self->expect_it('-re',qr/^[*]/);
+    $self->expect_it('-re','^[*]');
     return $self->before();
 }
 
@@ -223,7 +223,7 @@ sub send_cmd_yes
     $self->{bconsole}->clear_accum();
     $self->send("yes\n");
 #    $self->expect_it("yes");
-    $self->expect_it('-re',qr/^[*]/);
+    $self->expect_it('-re','^[*]');
     return $self->before();
 }
 
@@ -254,7 +254,7 @@ sub label_barcodes
     $self->send("yes\n");
 #    $self->expect_it("yes");
 #    $res .= $self->before();
-    $self->expect_it('-re',qr/^[*]/);
+    $self->expect_it('-re','^[*]');
     $res .= $self->before();
     return $res;
 }
@@ -452,7 +452,7 @@ my $c = new Bconsole(pref => {
 print "fileset : ", join(',', $c->list_fileset()), "\n";
 print "job : ",     join(',', $c->list_job()), "\n";
 print "storage : ", join(',', $c->list_storage()), "\n";
-print $c->label_barcodes(pool => 'Scratch', drive => 0, storage => 'LTO3', slots => '45');
+#print $c->label_barcodes(pool => 'Scratch', drive => 0, storage => 'LTO3', slots => '45');
 #print "prune : " . $c->prune_volume('000001'), "\n";
 #print "update : " . $c->send_cmd('update slots storage=SDLT-1-2, drive=0'), "\n";
 #print "label : ", join(',', $c->label_barcodes(storage => 'SDLT-1-2',

diff --git a/gui/bweb/technotes-2.3 b/gui/bweb/technotes-2.3
index c25b19d9cf8c0e40dd704b5640a1dc99ff12ebef..cd6cf235fe75bae257a6caf3efbf867c2b2c4050 100644 (file)
--- a/gui/bweb/technotes-2.3
+++ b/gui/bweb/technotes-2.3
@@ -1,3 +1,6 @@
+06Nov08
+ebl  Fix a Bconsole.pm with Expect bug on debian lenny
+
 04Nov08
 ebl  Display all groups in display_stat page