From 373ff04261a1c72fe8ba5967d7e51908ed4d5e68 Mon Sep 17 00:00:00 2001 From: Jordi Boggiano Date: Mon, 4 Mar 2013 12:30:53 +0100 Subject: [PATCH] Fetch only non-dev packages from lock if doing a dev update fails due to a previously incomplete lock file, fixes #1650 --- src/Composer/Installer.php | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/Composer/Installer.php b/src/Composer/Installer.php index e1417019f..574a7ccb1 100644 --- a/src/Composer/Installer.php +++ b/src/Composer/Installer.php @@ -377,7 +377,12 @@ class Installer // to the version specified in the lock, or their currently installed version if ($this->update && $this->updateWhitelist) { if ($this->locker->isLocked()) { - $currentPackages = $this->locker->getLockedRepository($withDevReqs)->getPackages(); + try { + $currentPackages = $this->locker->getLockedRepository($withDevReqs)->getPackages(); + } catch (\RuntimeException $e) { + // fetch only non-dev packages from lock if doing a dev update fails due to a previously incomplete lock file + $currentPackages = $this->locker->getLockedRepository()->getPackages(); + } } else { $currentPackages = $installedRepo->getPackages(); }