Fix svn status with externals, fixes #766

12 years ago · d53ebf5ba9
parent 1aa2cfe6e1
commit d53ebf5ba9
1 changed files with 3 additions and 3 deletions
--- a/src/Composer/Downloader/SvnDownloader.php
+++ b/src/Composer/Downloader/SvnDownloader.php
@ -50,9 +50,9 @@ class SvnDownloader extends VcsDownloader
     */
    protected function enforceCleanDirectory($path)
    {
-        $this->process->execute('svn status', $output, $path);
-        if (trim($output)) {
-            throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes');
+        $this->process->execute('svn status --ignore-externals', $output, $path);
+        if (preg_match('{^ *[^X ] +}m', $output)) {
+            throw new \RuntimeException('Source directory ' . $path . ' has uncommitted changes:'."\n\n".rtrim($output));
        }
    }