Do not scramble password read from .cvspass

Passwords stored in .cvspass are already scrambled, we do not
want to scramble them twice. Only passwords read from the
command line are scrambled.

This fixes a regression introduced by b2139db (git-cvsimport: add support
for cvs pserver password scrambling., 2009-08-14).

Signed-off-by: Pascal Obry <[email protected]>
Signed-off-by: Junio C Hamano <[email protected]>

Author: TurboGit

git-cvsimport.perl

@@ -238,7 +238,9 @@ sub conn {
 		}
 		my $rr = ":pserver:$user\@$serv:$port$repo";
 
-		unless ($pass) {
+		if ($pass) {
+			$pass = $self->_scramble($pass);
+		} else {
 			open(H,$ENV{'HOME'}."/.cvspass") and do {
 				# :pserver:[email protected]:/cvsroot/zmailer Ah<Z
 				while (<H>) {
@@ -253,8 +255,6 @@ sub conn {
 			};
 		}
 
-		$pass = $self->_scramble($pass);
-
 		my ($s, $rep);
 		if ($proxyhost) {