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

Fix parsing of trunk in SvnDriver, fixes composer/satis#88

pull/2221/merge
Jordi Boggiano 2013-08-31 15:22:08 +02:00
parent ef072ff8c0
commit 2bf90b544a
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Composer/Repository/Vcs/SvnDriver.php
View File

@ -193,7 +193,13 @@ class SvnDriver extends VcsDriver
if (null === $this->branches) { if (null === $this->branches) {
$this->branches = array(); $this->branches = array();
$output = $this->execute('svn ls --verbose', $this->baseUrl . '/'); if (false === strpos($this->trunkPath, '/')) {
$trunkParent = $this->baseUrl . '/';
} else {
$trunkParent = $this->baseUrl . '/' . dirname($this->trunkPath) . '/';
}
$output = $this->execute('svn ls --verbose', $trunkParent);
if ($output) { if ($output) {
foreach ($this->process->splitLines($output) as $line) { foreach ($this->process->splitLines($output) as $line) {
$line = trim($line); $line = trim($line);