cvs: php-src(PHP_4_3) /pear/PEAR/Command Package.php
| From: | Greg Beaver | Date: | Tue, 08 Jun 2004 18:26:32 +0000 |
| Subject: | cvs: php-src(PHP_4_3) /pear/PEAR/Command Package.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-core+get-383@lists.php.net to get a copy of this message | ||
cellog Tue Jun 8 14:26:32 2004 EDT
Modified files: (Branch: PHP_4_3)
/php-src/pear/PEAR/Command Package.php
Log:
MFH partial fix, bug #1163: rpm build doesn't build properly
http://cvs.php.net/diff.php/php-src/pear/PEAR/Command/Package.php?r1=1.42.2.16&r2=1.42.2.17&ty=u
Index: php-src/pear/PEAR/Command/Package.php
diff -u php-src/pear/PEAR/Command/Package.php:1.42.2.16
php-src/pear/PEAR/Command/Package.php:1.42.2.17
--- php-src/pear/PEAR/Command/Package.php:1.42.2.16 Thu Feb 19 10:55:37 2004
+++ php-src/pear/PEAR/Command/Package.php Tue Jun 8 14:26:32 2004
@@ -17,7 +17,7 @@
// | Martin Jansen <mj@php.net> |
// +----------------------------------------------------------------------+
//
-// $Id: Package.php,v 1.42.2.16 2004/02/19 15:55:37 cellog Exp $
+// $Id: Package.php,v 1.42.2.17 2004/06/08 18:26:32 cellog Exp $
require_once 'PEAR/Common.php';
require_once 'PEAR/Command/Common.php';
@@ -639,6 +639,9 @@
$srcfiles = 0;
foreach ($info['filelist'] as $name => $attr) {
+ if (!isset($attr['role'])) {
+ continue;
+ }
if ($attr['role'] == 'doc') {
$info['doc_files'] .= " $name";
@@ -677,6 +680,7 @@
}
+ $name = str_replace('\\', '/', $name);
$info['files'] .= "$prefix/$name\n";
}