From: Rob H. <for...@us...> - 2002-06-05 02:07:37
|
Update of /cvsroot/sandweb/sandweb/lib/SandWeb/Repository In directory usw-pr-cvs1:/tmp/cvs-serv11155/lib/SandWeb/Repository Modified Files: cvs.pm Log Message: fixed problem reported by Blake on the -devel list. just needed to be implemented correctly, depending on the presence of username/password to decide if we are doing SSH or not is dumb :P Index: cvs.pm =================================================================== RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Repository/cvs.pm,v retrieving revision 1.14 retrieving revision 1.15 diff -U2 -r1.14 -r1.15 --- cvs.pm 3 May 2002 17:17:34 -0000 1.14 +++ cvs.pm 5 Jun 2002 02:07:32 -0000 1.15 @@ -840,7 +840,19 @@ my $system_password = $self->get_system_password() || ''; + my $vcs = ''; + my $unix = ''; + my $file = $args{'file'}; my $param = $args{'param'}; + if ( $connection eq 'SSH' ) { + $root = ":ext:$vcs_username\@$server:$root"; + $vcs = 1; + } + elsif ( $connection eq 'pserver' ) { + $root = ":pserver:$vcs_username\@$server:$root"; + $vcs = 1; + } + my $shell = SandWeb::Shell->new( 'vcs_username' => "$vcs_username", @@ -849,12 +861,7 @@ 'system_password' => "$system_password", 'bindir' => "$bindir", + 'unix' => "$unix", + 'vcs' => "$vcs", ); - - if ( $connection eq 'SSH' ) { - $root = ":ext:$vcs_username\@$server:$root"; - } - elsif ( $connection eq 'pserver' ) { - $root = ":pserver:$vcs_username\@$server:$root"; - } my $output = $shell->execute( |