From: Rob H. <for...@us...> - 2002-03-04 18:43:14
|
Update of /cvsroot/sandweb/sandweb/bin In directory usw-pr-cvs1:/tmp/cvs-serv29078 Modified Files: sandweb.cgi Log Message: repo_root and vcsroot are the same thing with different names. removed vcsroot in favor of repo_root. Index: sandweb.cgi =================================================================== RCS file: /cvsroot/sandweb/sandweb/bin/sandweb.cgi,v retrieving revision 1.246 retrieving revision 1.247 diff -U2 -r1.246 -r1.247 --- sandweb.cgi 4 Mar 2002 05:05:25 -0000 1.246 +++ sandweb.cgi 4 Mar 2002 18:43:07 -0000 1.247 @@ -539,25 +539,23 @@ my $repo_root = $user->get_repo_root(repo => $repo_name); - my $vcsroot; - if ( $repo_type eq 'CVS' ) { $log->debug("repo_type is CVS"); if ( $repo_connection eq 'local' ) { - $vcsroot = "$repo_root"; + $repo_root = "$repo_root"; } else { - $vcsroot = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; + $repo_root = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; } } - if ( $vcsroot ) { - $log->debug("setting up vcsroot $vcsroot"); + if ( $repo_root ) { + $log->debug("setting up repo_root $repo_root"); } else { - $log->debug("no vcsroot set!"); + $log->debug("no repo_root set!"); } $log->debug("creating Repository object"); my $repository = SandWeb::Repository->new( - 'root' => "$vcsroot", + 'root' => "$repo_root", 'repo_type' => $repo_type, ); @@ -792,5 +790,4 @@ # selected repository data - my $vcsroot; my $repository = SandWeb::Repository->new( @@ -1610,11 +1607,10 @@ my @vcs_output = (); my @vcs_error = (); - my $vcsroot; if ( $repo_type eq 'CVS' ) { if ( $repo_connection eq 'local' ) { - $vcsroot = "$repo_root"; + $repo_root = "$repo_root"; } else { - $vcsroot = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; + $repo_root = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; } } @@ -1827,5 +1823,4 @@ # - my $vcsroot; my @vcs_output = (); my @vcs_error = (); @@ -1833,7 +1828,7 @@ if ( $repo_type eq 'CVS' ) { if ( $repo_connection eq 'local' ) { - $vcsroot = "$repo_root"; + $repo_root = "$repo_root"; } else { - $vcsroot = + $repo_root = ":$repo_connection:$repo_username\@$repo_server:$repo_root"; } @@ -1841,5 +1836,5 @@ my $repository = SandWeb::Repository->new( - root => $vcsroot, + root => $repo_root, repo_type => $repo_type, sandbox => "$users_dir/$username/$repo_name", |