OSSP CVS Repository

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

Check-in Number: 1435
Date: 2001-Dec-16 14:08:11 (local)
2001-Dec-16 13:08:11 (UTC)
User:ossp-cvs
Branch:
Comment: disable special OSSP CVS feature
Tickets:
Inspections:
Files:
CVSROOT/config      1.3 -> 1.4     2 inserted, 2 deleted
CVSROOT/shiela      1.9 -> 1.10     6 inserted, 3 deleted
CVSROOT/config 1.3 -> 1.4 

--- config       2001/12/16 13:04:17     1.3
+++ config       2001/12/16 13:08:11     1.4
@@ -30,11 +30,11 @@
 #   [only available with OSSP patches]
 #HistoryFile=CVSROOT/history
 
-#   Set `LocalIdName' to the name of a local tag to use in addition to $Id: config,v 1.3 2001/12/16 13:04:17 ossp-cvs Exp $
+#   Set `LocalIdName' to the name of a local tag to use in addition to $Id: config,v 1.4 2001/12/16 13:08:11 ossp-cvs Exp $
 #   [only available with OSSP patches]
 #LocalIdName=OSSP
 
 #   Set `UMask' to the octal value of the umask under which CVS should run
 #   [only available with OSSP patches]
-UMask=002
+#UMask=002

CVSROOT/shiela 1.9 -> 1.10 

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

CVSTrac 2.0.1