For PEAR2 packages, don't set the baseinstalldir to PEAR2 if the src …

…directory already has this. This allows PEAR2 packages to use src/PEAR2/PackageName in the repository, instead of just src/PackageName.
helgi · Jan 24, 2011 · c7657d0 · c7657d0
1 parent 061bbc6
commit c7657d0
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/Pyrus/Developer/PackageFile/PEAR2SVN.php b/src/Pyrus/Developer/PackageFile/PEAR2SVN.php
@@ -86,7 +86,8 @@ function __construct($path, $packagename = '##set me##', $channel = 'pear2.php.n
         $packagepath = explode('_', $packagename);
 
         if ($fullpathsused) {
-            if ($this->pxml->channel == 'pear2.php.net') {
+            if ($this->pxml->channel == 'pear2.php.net'
+                && !is_dir($path . '/src/PEAR2')) {
                 $packagepath = array('PEAR2');
             } else {
                 $packagepath = array('/');