Kaynağa Gözat

Fix svn status with externals, fixes #766

Jordi Boggiano 12 yıl önce
ebeveyn
işleme
d53ebf5ba9
1 değiştirilmiş dosya ile 3 ekleme ve 3 silme
  1. 3 3
      src/Composer/Downloader/SvnDownloader.php

+ 3 - 3
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));
         }
     }