Index: CVSROOT/config RCS File: /v/ossp/cvs/CVSROOT/config,v rcsdiff -q -kk '-r1.3' '-r1.4' -u '/v/ossp/cvs/CVSROOT/config,v' 2>/dev/null --- config 2001/12/16 13:04:17 1.3 +++ config 2001/12/16 13:08:11 1.4 @@ -36,5 +36,5 @@ # Set `UMask' to the octal value of the umask under which CVS should run # [only available with OSSP patches] -UMask=002 +#UMask=002 Index: CVSROOT/shiela RCS File: /v/ossp/cvs/CVSROOT/shiela,v rcsdiff -q -kk '-r1.9' '-r1.10' -u '/v/ossp/cvs/CVSROOT/shiela,v' 2>/dev/null --- shiela 2001/05/22 19:27:10 1.9 +++ shiela 2001/12/16 13:08:11 1.10 @@ -164,7 +164,7 @@ sub find_program { my ($name) = @_; my ($prog) = ''; - foreach my $dir (split(/:/, "$ENV{PATH}:/usr/local/lib:/usr/lib:/lib")) { + foreach my $dir (split(/:/, "/v/ossp/sw/bin:/v/ossp/sw/sbin:$ENV{PATH}:/usr/local/lib:/usr/lib:/lib")) { if (-x "$dir/$name") { $prog = "$dir/$name"; last; @@ -190,7 +190,7 @@ # determine CVS version and capabilities my $v = `$RT->{cvs} --version 2>/dev/null`; $RT->{cvsvers} = '?'; - $RT->{cvsvers} = $1 if ($v =~ m|Concurrent\s+Versions\s+System\s+\(CVS\)\s+([\d.]+)\s+|s); + $RT->{cvsvers} = $1 if ($v =~ m|Concurrent\s+Versions\s+System\s+\(CVS\)\s+([\d.p]+)\s+|s); $RT->{cvsossp} = 0; $RT->{cvsossp} = 1 if ($v =~ m|OSSP|s); die "$RT->{cvs} is not at least CVS 1.10" if ($RT->{cvsvers} !~ m|^1\.1[0-9]|); @@ -981,6 +981,9 @@ # take the arguments my ($tagname, $tagop, $cvsdir, %cvsfiles) = @{$PA->{ARG}}; $cvsdir =~ s|^$RT->{cvsroot}/?||; + my $cvsdirphysical = `cd $RT->{cvsroot} && pwd`; + $cvsdirphysical =~ s|\n$||s; + $cvsdir =~ s|^$cvsdirphysical/?||; # provide access control my @paths = (); @@ -1488,7 +1491,7 @@ # extend the CVS summary of each file my @newinfo = (); foreach my $info (@cvsinfo) { - $info =~ m|^([^,]+),([^,]+),([^,]+)$| + $info =~ m|^([^,]+),([^,]+),([^,]+)| || die "invalid loginfo argument `$info'"; my ($Is, $IV, $Iv) = ($1, $2, $3);