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

Fix svn status with externals, fixes #766

pull/770/merge
Jordi Boggiano 2012-06-04 11:21:17 +02:00
parent 1aa2cfe6e1
commit d53ebf5ba9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Composer/Downloader/SvnDownloader.php
View File

@ -50,9 +50,9 @@ class SvnDownloader extends VcsDownloader
*/ */
protected function enforceCleanDirectory($path) protected function enforceCleanDirectory($path)
{ {
$this->process->execute('svn status', $output, $path); $this->process->execute('svn status --ignore-externals', $output, $path);
if (trim($output)) { if (preg_match('{^ *[^X ] +}m', $output)) {
throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes'); throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes:'."\n\n".rtrim($output));
} }
} }