From: Eric Bollengier Date: Sat, 18 Nov 2006 16:32:35 +0000 (+0000) Subject: ebl add prepare method and drop cmd_yes command X-Git-Tag: Release-2.0.0~269 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6ea1a28f2010fb4bd60e2a788a9adf75fa10268b;p=bacula%2Fbacula ebl add prepare method and drop cmd_yes command git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@3648 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/gui/bweb/lib/Bconsole.pm b/gui/bweb/lib/Bconsole.pm index d671ea631b..b8304a6c67 100644 --- a/gui/bweb/lib/Bconsole.pm +++ b/gui/bweb/lib/Bconsole.pm @@ -65,8 +65,7 @@ sub run return 0; } - print "=> $cmd yes\n"; - + print STDERR "===> $cmd yes\n"; $self->{bconsole}->clear_accum(); $self->send("$cmd yes\n"); $self->expect_it('-re',qr/^[*]/); @@ -78,6 +77,12 @@ sub run } } +# for brestore.pl::BwebConsole +sub prepare +{ + # do nothing +} + sub send { my ($self, $what) = @_; @@ -361,7 +366,7 @@ sub prune_volume my $sel = $self->_get_volume(@volume); my $ret; if ($sel) { - $ret = $self->send_cmd_yes("prune $sel"); + $ret = $self->send_cmd("prune $sel yes"); } else { $ret = $self->{error}; }