public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #3967 from xi-ao/master 

Fixed svn update command
pull/4003/head
Jordi Boggiano 2015-05-05 18:07:08 +01:00
parent 21e92b869e 27074083cc
commit 13a3349603
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/Composer/Util/Svn.php
View File

@ -120,16 +120,15 @@ class Svn
return $output; return $output;
} }
if (empty($output)) { $errorOutput = $this->process->getErrorOutput();
$output = $this->process->getErrorOutput(); $fullOutput = implode("\n", array($output, $errorOutput));
}
// the error is not auth-related // the error is not auth-related
if (false === stripos($output, 'Could not authenticate to server:') if (false === stripos($fullOutput, 'Could not authenticate to server:')
&& false === stripos($output, 'authorization failed') && false === stripos($fullOutput, 'authorization failed')
&& false === stripos($output, 'svn: E170001:') && false === stripos($fullOutput, 'svn: E170001:')
&& false === stripos($output, 'svn: E215004:')) { && false === stripos($fullOutput, 'svn: E215004:')) {
throw new \RuntimeException($output); throw new \RuntimeException($fullOutput);
} }
if (!$this->hasAuth()) { if (!$this->hasAuth()) {
@ -143,7 +142,7 @@ class Svn
} }
throw new \RuntimeException( throw new \RuntimeException(
'wrong credentials provided ('.$output.')' 'wrong credentials provided ('.$fullOutput.')'
); );
} }