Index: ossp-pkg/shiela/ChangeLog RCS File: /v/ossp/cvs/ossp-pkg/shiela/ChangeLog,v rcsdiff -q -kk '-r1.27' '-r1.28' -u '/v/ossp/cvs/ossp-pkg/shiela/ChangeLog,v' 2>/dev/null --- ChangeLog 2002/12/23 09:13:41 1.27 +++ ChangeLog 2002/12/23 11:32:05 1.28 @@ -9,6 +9,17 @@ ChangeLog + Changes between 1.0.2 and 1.0.3 (23-Dec-2002 to xx-Dec-2002): + + *) Correctly recognize and configure RSE CVS version in + shiela-install program. + [Ralf S. Engelschall] + + *) Be smart and allow a RSE CVS version to be driven like a stock + CVS version in loginfo (still using "sVv" instead of "sVvto" as + the flags). + [Ralf S. Engelschall] + Changes between 1.0.1 and 1.0.2 (22-Dec-2002 to 23-Dec-2002): *) Make sure that /bin:/usr/bin:/sbin:/usr/sbin is in $PATH Index: ossp-pkg/shiela/shiela-install.sh RCS File: /v/ossp/cvs/ossp-pkg/shiela/shiela-install.sh,v rcsdiff -q -kk '-r1.15' '-r1.16' -u '/v/ossp/cvs/ossp-pkg/shiela/shiela-install.sh,v' 2>/dev/null --- shiela-install.sh 2002/12/23 09:13:41 1.15 +++ shiela-install.sh 2002/12/23 11:32:05 1.16 @@ -594,7 +594,7 @@ run "(echo ''; echo 'ALL $V_tool_shiela --hook=taginfo'; echo '') >>taginfo" cvs_file add taginfo -if [ ".$CVS_VENDOR" = .OSSP ]; then +if [ ".$CVS_VENDOR" = .RSE ]; then cvs_file tst importinfo run "(echo ''; echo 'ALL $V_tool_shiela --hook=importinfo'; echo '') >>importinfo" cvs_file add importinfo @@ -612,7 +612,7 @@ run "(echo ''; echo 'DEFAULT $V_tool_shiela --hook=verifymsg'; echo '') >>verifymsg" cvs_file add verifymsg -if [ ".$CVS_VENDOR" = .OSSP ]; then +if [ ".$CVS_VENDOR" = .RSE ]; then flags="sVvto" else flags="sVv" Index: ossp-pkg/shiela/shiela.pl RCS File: /v/ossp/cvs/ossp-pkg/shiela/shiela.pl,v rcsdiff -q -kk '-r1.41' '-r1.42' -u '/v/ossp/cvs/ossp-pkg/shiela/shiela.pl,v' 2>/dev/null --- shiela.pl 2002/12/23 11:21:42 1.41 +++ shiela.pl 2002/12/23 11:32:05 1.42 @@ -1293,7 +1293,7 @@ ## ## VERIFYMSG HOOK ## -## We hook into CVS via `verifymsg' to post-process log messages. +## We hook into CVS via `commitinfo' to post-process log messages. ## The intention is to sanitise the results of what the user may have ## `done' while editing the commit log message. If CVS is a standard ## version, this check is advisory only. If CVS contains the RSE @@ -1512,7 +1512,10 @@ # if we are using a stock CVS version, we have to determine # extra information (which an RSE CVS version would provide). - if (not $RT->{cvsrse} and not $RT->{cvsop} eq 'import') { + if ( ( ( defined($cvsinfo[0]) + and $cvsinfo[0] =~ m|^([^,]+),([^,]+),([^,]+)$|) + or not $RT->{cvsrse} ) + and not $RT->{cvsop} eq 'import' ) { # parse CVS commit information my $tag = 'HEAD';