Merge branch '2.2' into 2.3

src/Composer/EventDispatcher/EventDispatcher.php

@@ -253,7 +253,14 @@ class EventDispatcher
                     }
                 } else {
                     $args = implode(' ', array_map(array('Composer\Util\ProcessExecutor', 'escape'), $event->getArguments()));
-                    $exec = $callable . ($args === '' ? '' : ' '.$args);
+
+                    // @putenv does not receive arguments
+                    if (strpos($callable, '@putenv ') === 0) {
+                        $exec = $callable;
+                    } else {
+                        $exec = $callable . ($args === '' ? '' : ' '.$args);
+                    }
+
                     if ($this->io->isVerbose()) {
                         $this->io->writeError(sprintf('> %s: %s', $event->getName(), $exec));
                     } elseif ($event->getName() !== '__exec_command') {

src/Composer/Repository/PathRepository.php

@@ -226,7 +226,11 @@ class PathRepository extends ArrayRepository implements ConfigurableRepositoryIn
                 }
             }
 
-            $this->addPackage($this->loader->load($package));
+            try {
+                $this->addPackage($this->loader->load($package));
+            } catch (\Exception $e) {
+                throw new \RuntimeException('Failed loading the package in '.$composerFilePath, 0, $e);
+            }
         }
     }