equal
deleted
inserted
replaced
249 sub invoke(@) |
249 sub invoke(@) |
250 { |
250 { |
251 my $self = shift; |
251 my $self = shift; |
252 die "self not defined\n" if (not defined($self)); |
252 die "self not defined\n" if (not defined($self)); |
253 |
253 |
|
254 my $sbsflag = index("@_", "sbs"); |
|
255 |
254 $self->info("Invoking: @_\n"); |
256 $self->info("Invoking: @_\n"); |
255 |
257 |
256 # Redirect stderr into stdout. |
258 # Redirect stderr into stdout. |
257 open(SAVEOUT, "@_ 2>&1 |") or $self->error("couldn't invoke @_"); |
259 open(SAVEOUT, "@_ 2>&1 |") or $self->error("couldn't invoke @_"); |
258 |
260 |
264 # Check for errors in the output |
266 # Check for errors in the output |
265 $self->detailed("Interpreting results of previous invocation\n"); |
267 $self->detailed("Interpreting results of previous invocation\n"); |
266 |
268 |
267 my @warnstrings = (); |
269 my @warnstrings = (); |
268 |
270 |
269 my $BuildSystemVersion = $ENV{'SBS_VERSION'}; |
271 if($sbsflag != -1) |
270 |
|
271 if ($BuildSystemVersion == 2) |
|
272 { |
272 { |
273 foreach (@out) |
273 foreach (@out) |
274 { |
274 { |
275 $self->error(@out) if (/errors:\s[^0]/i); |
275 $self->error(@out) if (/errors:\s[^0]/i); |
276 |
276 |