From 2f82ed7035802ae72b4953127b784e4fdb985090 Mon Sep 17 00:00:00 2001 From: Anael Ollier Date: Tue, 28 Apr 2015 11:19:29 +0200 Subject: [PATCH] Fixed the fix :) --- src/Composer/Util/Svn.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/Composer/Util/Svn.php b/src/Composer/Util/Svn.php index b91592b03..fc9a547ba 100644 --- a/src/Composer/Util/Svn.php +++ b/src/Composer/Util/Svn.php @@ -121,10 +121,7 @@ class Svn } $errorOutput = $this->process->getErrorOutput(); - if (empty($output)) { - $output = $errorOutput; - } - $fullOutput = "$output\n$errorOutput"; + $fullOutput = join("\n", array($output, $errorOutput)); // the error is not auth-related if (false === stripos($fullOutput, 'Could not authenticate to server:') @@ -145,7 +142,7 @@ class Svn } throw new \RuntimeException( - 'wrong credentials provided ('.$output.')' + 'wrong credentials provided ('.$fullOutput.')' ); }