svn: /pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/ PEAR2SVN.php

saltybeagle                              Mon, 24 Jan 2011 20:58:46 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=307720

Log:
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.

Changed paths:
    U   pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN.php

Modified: pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN.php
===================================================================
--- pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN.php	2011-01-24 20:58:09 UTC (rev 307719)
+++ pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN.php	2011-01-24 20:58:46 UTC (rev 307720)
@@ -86,7 +86,8 @@
         $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('/');