OSSP CVS Repository

ossp - Check-in [3036]
Not logged in
[Honeypot]  [Browse]  [Home]  [Login]  [Reports
[Search]  [Ticket]  [Timeline
  [Patchset]  [Tagging/Branching

Check-in Number: 3036
Date: 2002-Dec-23 12:32:05 (local)
2002-Dec-23 11:32:05 (UTC)
User:rse
Branch:
Comment: 1. Correctly recognize and configure RSE CVS version in shiela-install program.

2. 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).

Tickets:
Inspections:
Files:
ossp-pkg/shiela/ChangeLog      1.27 -> 1.28     11 inserted, 0 deleted
ossp-pkg/shiela/shiela-install.sh      1.15 -> 1.16     2 inserted, 2 deleted
ossp-pkg/shiela/shiela.pl      1.41 -> 1.42     5 inserted, 2 deleted

ossp-pkg/shiela/ChangeLog 1.27 -> 1.28

--- 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


ossp-pkg/shiela/shiela-install.sh 1.15 -> 1.16

--- 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"


ossp-pkg/shiela/shiela.pl 1.41 -> 1.42

--- 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';

CVSTrac 2.0.1