helly Wed Jun 4 14:36:33 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar/phar pharcommand.inc
Log:
- Make sure we are not trying to pack directories
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/phar/pharcommand.inc?r1=1.49.2.7&r2=1.49.2.8&diff_format=u
Index: php-src/ext/phar/phar/pharcommand.inc
diff -u php-src/ext/phar/phar/pharcommand.inc:1.49.2.7
php-src/ext/phar/phar/pharcommand.inc:1.49.2.8
--- php-src/ext/phar/phar/pharcommand.inc:1.49.2.7 Wed Jun 4 09:46:34 2008
+++ php-src/ext/phar/phar/pharcommand.inc Wed Jun 4 14:36:33 2008
@@ -616,7 +616,7 @@
try {
foreach($dir as $file) {
- if (empty($stub) || $file->getRealPath() !=
$stub->getRealPath()) {
+ if ((empty($stub) || $file->getRealPath() !=
$stub->getRealPath()) && !is_dir($file)) {
self::phar_add_file($phar, $level, $dir->getSubPathName(),
$file, $compress, $noloader);
}
}
@@ -1539,7 +1539,7 @@
$use_ext = extension_loaded('phar');
$version = array(
'PHP Version' => phpversion(),
- 'phar.phar version' => '$Revision: 1.49.2.7 $',
+ 'phar.phar version' => '$Revision: 1.49.2.8 $',
'Phar EXT version' => $use_ext ? phpversion('phar') : 'Not
available',
'Phar API version' => Phar::apiVersion(),
'Phar-based phar archives' => true,
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
