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

cellog                                   Mon, 10 Jan 2011 04:43:44 +0000

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

Log:
oops, fix two obvious flaws in the scanoptions implementation, now it actually grabs the options and actually ignores directories requested

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

Modified: pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/Commands.php
===================================================================
--- pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/Commands.php	2011-01-10 04:36:30 UTC (rev 307324)
+++ pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/Commands.php	2011-01-10 04:43:44 UTC (rev 307325)
@@ -39,14 +39,16 @@
         if ($options['scanoptions']) {
             $file = $options['scanoptions'];
             $path = $dir;
-            $getscanoptions = function() use ($scanoptions, $path, $file) {
+            $getscanoptions = function() use ($path, $file) {
+                $scanoptions = array();
                 include $path . '/' . $file;
+                return $scanoptions;
             };
-            $getscanoptions();
+            $scanoptions = $getscanoptions();
         }
         echo "Creating package.xml...";
         $pear2svn = new PEAR2SVN($dir, $args['packagename'], $args['channel'],
-                                                       false, true, !$options['nocompatible']);
+                                 false, true, !$options['nocompatible'], $scanoptions);
         if (!$options['packagexmlsetup'] && file_exists($pear2svn->path . '/packagexmlsetup.php')) {
             $options['packagexmlsetup'] = 'packagexmlsetup.php';
         }

Modified: pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN/Filter.php
===================================================================
--- pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN/Filter.php	2011-01-10 04:36:30 UTC (rev 307324)
+++ pear2/Pyrus_Developer/trunk/src/Pyrus/Developer/PackageFile/PEAR2SVN/Filter.php	2011-01-10 04:43:44 UTC (rev 307325)
@@ -32,7 +32,7 @@
         foreach ($this->ignore as $testpath => $type) {
             if ($type == 'file') {
                 $test = $path;
-            } elseif ($type == 'path') {
+            } elseif ($type == 'dir') {
                 $test = dirname($path);
             }
             if (strpos($test, $testpath) !== false) {