Fixed svn update command (fails before attempting to use authentication provided in auth.json)

main
Anael Ollier 9 years ago
parent 1cb427ff5c
commit b2efb95f33

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

Loading…
Cancel
Save