Merge pull request #2405 from discordier/fix-upgrade-cache

Fix cache directory upgrading - do not try to (re)move the active cache dir.

src/Composer/Factory.php

@@ -118,10 +118,12 @@ class Factory
                             @rename($child, $dir.'/'.basename($child));
                         }
                     }
+                    if ($config->get('cache-dir') != $oldPath) {
                         @rmdir($oldPath);
                     }
                 }
             }
+        }
 
         return $config;
     }