Browse Source

Avoid throwing when checking for disk space, fixes #2039

Jordi Boggiano 12 years ago
parent
commit
307c384294
2 changed files with 4 additions and 4 deletions
  1. 2 2
      src/Composer/Command/DiagnoseCommand.php
  2. 2 2
      src/Composer/Console/Application.php

+ 2 - 2
src/Composer/Command/DiagnoseCommand.php

@@ -219,8 +219,8 @@ EOT
     private function checkDiskSpace($config)
     {
         $minSpaceFree = 1024*1024;
-        if ((($df = disk_free_space($dir = $config->get('home'))) !== false && $df < $minSpaceFree)
-            || (($df = disk_free_space($dir = $config->get('vendor-dir'))) !== false && $df < $minSpaceFree)
+        if ((($df = @disk_free_space($dir = $config->get('home'))) !== false && $df < $minSpaceFree)
+            || (($df = @disk_free_space($dir = $config->get('vendor-dir'))) !== false && $df < $minSpaceFree)
         ) {
             return '<error>The disk hosting '.$dir.' is full</error>';
         }

+ 2 - 2
src/Composer/Console/Application.php

@@ -152,8 +152,8 @@ class Application extends BaseApplication
                 $config = $composer->getConfig();
 
                 $minSpaceFree = 1024*1024;
-                if ((($df = disk_free_space($dir = $config->get('home'))) !== false && $df < $minSpaceFree)
-                    || (($df = disk_free_space($dir = $config->get('vendor-dir'))) !== false && $df < $minSpaceFree)
+                if ((($df = @disk_free_space($dir = $config->get('home'))) !== false && $df < $minSpaceFree)
+                    || (($df = @disk_free_space($dir = $config->get('vendor-dir'))) !== false && $df < $minSpaceFree)
                 ) {
                     $output->writeln('<error>The disk hosting '.$dir.' is full, this may be the cause of the following exception</error>');
                 }