public-mirrors
/
composer
mirror of https://github.com/composer/composer
1
0
Fork 0
Code

Merge pull request #2681 from trivago/svn_fix 

fixed svn tags directory handling
pull/2682/head
Nils Adermann 2014-02-07 10:59:35 +01:00
parent b7a9ea4187 0f95e531b8
commit 7343198817
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Composer/Package/Loader/RootPackageLoader.php
View File

@ -312,7 +312,7 @@ class RootPackageLoader extends ArrayLoader
$urlPattern = '#<url>.*/('.$trunkPath.'|('.$branchesPath.'|'. $tagsPath .')/(.*))</url>#'; $urlPattern = '#<url>.*/('.$trunkPath.'|('.$branchesPath.'|'. $tagsPath .')/(.*))</url>#';
if (preg_match($urlPattern, $output, $matches)) { if (preg_match($urlPattern, $output, $matches)) {
if (isset($matches[2]) && $branchesPath === $matches[2]) { if (isset($matches[2]) && ($branchesPath === $matches[2] || $tagsPath === $matches[2])) {
// we are in a branches path // we are in a branches path
$version = $this->versionParser->normalizeBranch($matches[3]); $version = $this->versionParser->normalizeBranch($matches[3]);
if ('9999999-dev' === $version) { if ('9999999-dev' === $version) {