Update of /cvsroot/openinteract/OpenInteract2/script
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6048/script
Modified Files:
oi2_manage
Log Message:
Silence warnings
Index: oi2_manage
===================================================================
RCS file: /cvsroot/openinteract/OpenInteract2/script/oi2_manage,v
retrieving revision 1.27
retrieving revision 1.28
diff -C2 -d -r1.27 -r1.28
*** oi2_manage 27 Sep 2004 03:46:53 -0000 1.27
--- oi2_manage 9 Nov 2004 13:49:37 -0000 1.28
***************
*** 113,116 ****
--- 113,117 ----
for ( $OPT{website_dir}, $OPT{package_dir}, $OPT{source_dir} ) {
+ next unless defined $_;
s/[\\|\/]+$//;
s/^~/$ENV{HOME}/
***************
*** 297,301 ****
sub show_parameter_error {
my ( $err ) = @_;
! my $out = "One or more parameters failed task checks. Task not executed.\n",
"Here are the parameters that failed and the reason for each.\n\n";
my $failed = $err->parameter_fail || {};
--- 298,302 ----
sub show_parameter_error {
my ( $err ) = @_;
! my $out = "One or more parameters failed task checks. Task not executed.\n".
"Here are the parameters that failed and the reason for each.\n\n";
my $failed = $err->parameter_fail || {};
***************
*** 337,341 ****
return unless ( $type eq 'progress' );
warn "PROGRESS: $message\n";
! if ( $params->{long} eq 'yes' ) {
warn " ... this may take a while ...\n";
}
--- 338,342 ----
return unless ( $type eq 'progress' );
warn "PROGRESS: $message\n";
! if ( defined $params->{long} and $params->{long} eq 'yes' ) {
warn " ... this may take a while ...\n";
}
***************
*** 345,348 ****
--- 346,351 ----
my ( $task, $type, $status ) = @_;
return unless ( $type eq 'status' );
+ $status->{action} ||= "unknown";
+ $status->{message} ||= "unknown";
my $show_ok = ( $status->{is_ok} eq 'yes' )
? 'OK' : 'FAILED';
|