瀏覽代碼

Fixed the fix :)

Anael Ollier 10 年之前
父節點
當前提交
2f82ed7035
共有 1 個文件被更改,包括 2 次插入5 次删除
  1. 2 5
      src/Composer/Util/Svn.php

+ 2 - 5
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.')'
         );
     }