浏览代码

Avoid updating newer versions in case of version conflict

Jordi Boggiano 13 年之前
父节点
当前提交
0829c17d23
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      src/Packagist/WebBundle/Command/UpdatePackagesCommand.php

+ 4 - 0
src/Packagist/WebBundle/Command/UpdatePackagesCommand.php

@@ -158,6 +158,10 @@ EOF
         // check if we have that version yet
         foreach ($package->getVersions() as $existingVersion) {
             if ($existingVersion->equals($version)) {
+                // avoid updating newer versions, in case two branches have the same version in their composer.json
+                if ($existingVersion->getReleasedAt() > $data->getReleaseDate()) {
+                    return;
+                }
                 if ($existingVersion->getDevelopment()) {
                     $version = $existingVersion;
                     break;