svn: /pear/pear-core/trunk/PEAR/Command/ Package.php

dufuz                                    Sun, 12 Sep 2010 12:14:59 +0000

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

Log:
Make sure we don't try to add the package file twice, in case people decided to package up their package.xml file specifically.

Changed paths:
    U   pear/pear-core/trunk/PEAR/Command/Package.php

Modified: pear/pear-core/trunk/PEAR/Command/Package.php
===================================================================
--- pear/pear-core/trunk/PEAR/Command/Package.php	2010-09-12 11:45:09 UTC (rev 303289)
+++ pear/pear-core/trunk/PEAR/Command/Package.php	2010-09-12 12:14:59 UTC (rev 303290)
@@ -523,7 +523,9 @@
         $dir   = dirname($packageFile);
         $dir   = substr($dir, strrpos($dir, '/') + 1);
         $files = array_keys($info->getFilelist());
-        $files[] = basename($packageFile);
+        if (!in_array(basename($packageFile))) {
+            $files[] = basename($packageFile);
+        }

         array_shift($params);
         if (count($params)) {