[Sandweb-commit] CVS: sandweb/lib/SandWeb Shell.pm,1.16,1.17

[Rob H. <for...@us...>]

Update of /cvsroot/sandweb/sandweb/lib/SandWeb
In directory usw-pr-cvs1:/tmp/cvs-serv7591/lib/SandWeb

Modified Files:
	Shell.pm 
Log Message:
improving expect error msgs


Index: Shell.pm
===================================================================
RCS file: /cvsroot/sandweb/sandweb/lib/SandWeb/Shell.pm,v
retrieving revision 1.16
retrieving revision 1.17
diff -U2 -r1.16 -r1.17
--- Shell.pm	19 Jun 2002 08:04:28 -0000	1.16
+++ Shell.pm	24 Jun 2002 20:39:25 -0000	1.17
@@ -106,5 +106,7 @@
 		if ( $vcs ) {
 			$log->debug("Using VCS username/password");
-			my $raw_output = `$sandweb_expect system_vcs $system_username $system_password \'$vcs_password\' $command`;
+			$log->debug("Full command is : $sandweb_expect system_vcs $system_username \'$system_password\' \'$vcs_password\' $command");
+			my $raw_output = `$sandweb_expect system_vcs $system_username \'$system_password\' \'$vcs_password\' "$command" 2>&1`;
+			$error = $?;
 			$raw_output =~ s/
/\n/g;
 			my @lined_output = split(/\n/, $raw_output);
@@ -115,4 +117,5 @@
 			$log->debug("Not using VCS username/password");
 			my $raw_output = `$sandweb_expect system $system_username $system_password $command`;
+			$error = $?;
                         $raw_output =~ s/^M/\n/g;
                         my @lined_output = split(/\n/, $raw_output);
@@ -124,4 +127,5 @@
 		$log->debug("Using VCS username/password");
 		my $raw_output = `$sandweb_expect vcs \'$vcs_password\' "$command" 2>&1`;
+		$error = $?;
                 $raw_output =~ s/^M/\n/g;
                 my @lined_output = split(/\n/, $raw_output);