Index: ossp-pkg/shiela/shiela.pl RCS File: /v/ossp/cvs/ossp-pkg/shiela/shiela.pl,v rcsdiff -q -kk '-r1.48' '-r1.49' -u '/v/ossp/cvs/ossp-pkg/shiela/shiela.pl,v' 2>/dev/null --- shiela.pl 2002/12/23 14:33:55 1.48 +++ shiela.pl 2002/12/23 14:42:23 1.49 @@ -60,15 +60,14 @@ $SIG{__DIE__} = sub { my ($text) = @_; $text =~ s|\s+at\s+.*||s; - my $name = ($0 =~ m|^.*?([^/]+?)(?:\.[^/.]+)?$|)[0]; - print STDERR $name.":ERROR: $text" . ($! ? " ($!)" : "") . "\n"; + print STDERR "cvs:shiela::ERROR: ". $text . ($! ? " ($!)" : "") . "\n"; exit(1); }; # determine run-time and configuration information my $PA = &pa_determine(@ARGV); my $RT = &rt_determine_one($0, $version); -my $CF = &cf_determine(($PA->{OPT}->{config} || $RT->{cvsadmdir}."/$RT->{name}.cfg")); +my $CF = &cf_determine(($PA->{OPT}->{config} || $RT->{cvsadmdir} . "/$RT->{name}.cfg")); $RT = &rt_determine_two($RT, $CF); # DEBUGGING @@ -379,7 +378,8 @@ my ($file) = @_; # read configuration file - my $io = new IO::File "<$file" || die "unable to open configuration file `$file'"; + my $io = new IO::File "<$file" + || die "unable to open configuration file `$file'"; my $t = ''; $t .= $_ while (<$io>); $io->close; @@ -879,8 +879,8 @@ sub history_load { my ($PA, $RT, $CF, $handle) = @_; - # XXX STILL MISSING, BECAUSE NOT USED XXX - # XXX HAS TO RE-DETERMINE DIFF AND LOG INFORMATION XXX + ## STILL MISSING, BECAUSE CURRENTLY NOT USED AT ALL. ## + ## WOULD HAVE TO RE-DETERMINE DIFF AND LOG INFORMATION. ## return; } @@ -970,7 +970,7 @@ # make sure CVS: lines do not harm anyone $msg =~ s/^CVS:.*?$//mg; - # remove common empty fields + # remove common empty fields (FIXME: PERHAPS TOO HARD-CODED) $msg =~ s/^(PR|Submitted by|Reviewed by|Approved by|Obtained from):\s*$//img; # remove trailing whitespaces @@ -1537,7 +1537,7 @@ # if we are using a stock CVS version, we have to determine # extra information (which an RSE CVS version would provide). - if ( ( ( defined($cvsinfo[0]) + if ( ( ( defined($cvsinfo[0]) and $cvsinfo[0] =~ m|^([^,]+),([^,]+),([^,]+)$|) or not $RT->{cvsrse} ) and not $RT->{cvsop} eq 'import' ) {