cellog Mon May 22 11:17:02 2006 UTC
Modified files: (Branch: PHP_4_4)
/php-src/pear install-pear.php
/php-src/pear/PEAR Downloader.php REST.php
/php-src/pear/PEAR/PackageFile/v2 Validator.php
Log:
fix PEAR build
http://cvs.php.net/viewcvs.cgi/php-src/pear/install-pear.php?r1=1.6.2.14.4.8&r2=1.6.2.14.4.9&diff_format=u
Index: php-src/pear/install-pear.php
diff -u php-src/pear/install-pear.php:1.6.2.14.4.8
php-src/pear/install-pear.php:1.6.2.14.4.9
--- php-src/pear/install-pear.php:1.6.2.14.4.8 Mon May 22 10:19:33 2006
+++ php-src/pear/install-pear.php Mon May 22 11:17:01 2006
@@ -1,10 +1,10 @@
<?php
-/* $Id: install-pear.php,v 1.6.2.14.4.8 2006/05/22 10:19:33 cellog Exp $ */
+/* $Id: install-pear.php,v 1.6.2.14.4.9 2006/05/22 11:17:01 cellog Exp $ */
error_reporting(E_ALL);
$pear_dir = dirname(__FILE__);
-ini_set('include_path', '');
+ini_set('include_path', $pear_dir);
if (function_exists('mb_internal_encoding')) {
mb_internal_encoding('ASCII');
}
@@ -126,6 +126,12 @@
foreach ($install_files as $package => $instfile) {
$info = &$pkg->fromAnyFile($instfile, PEAR_VALIDATE_INSTALLING);
if (PEAR::isError($info)) {
+ if (is_array($info->getUserInfo())) {
+ foreach ($info->getUserInfo() as $err) {
+ $ui->outputData(sprintf("[PEAR] %s: %s", $err['level'],
+ $err['message']));
+ }
+ }
$ui->outputData(sprintf("[PEAR] %s: %s", $package,
$info->getMessage()));
continue;
@@ -134,6 +140,12 @@
$downloaderpackage = &new PEAR_Downloader_Package($installer);
$err = $downloaderpackage->initialize($instfile);
if (PEAR::isError($err)) {
+ if (is_array($err->getUserInfo())) {
+ foreach ($err->getUserInfo() as $error) {
+ $ui->outputData(sprintf("[PEAR] %s: %s", $error['level'],
+ $error['message']));
+ }
+ }
$ui->outputData(sprintf("[PEAR] %s: %s", $package,
$err->getMessage()));
continue;
}
http://cvs.php.net/viewcvs.cgi/php-src/pear/PEAR/Downloader.php?r1=1.9.2.8.2.2&r2=1.9.2.8.2.3&diff_format=u
Index: php-src/pear/PEAR/Downloader.php
diff -u php-src/pear/PEAR/Downloader.php:1.9.2.8.2.2
php-src/pear/PEAR/Downloader.php:1.9.2.8.2.3
--- php-src/pear/PEAR/Downloader.php:1.9.2.8.2.2 Mon May 22 10:19:33 2006
+++ php-src/pear/PEAR/Downloader.php Mon May 22 11:17:01 2006
@@ -18,7 +18,7 @@
* @author Martin Jansen <[EMAIL PROTECTED]>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Downloader.php,v 1.9.2.8.2.2 2006/05/22 10:19:33
cellog Exp $
+ * @version CVS: $Id: Downloader.php,v 1.9.2.8.2.3 2006/05/22 11:17:01
cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.3.0
*/
@@ -1395,7 +1395,7 @@
$ifmodifiedsince = ($lastmodified ? "If-Modified-Since:
$lastmodified\r\n" : '');
}
$request .= "Host: $host:$port\r\n" . $ifmodifiedsince .
- "User-Agent: PEAR/@package_version@/PHP/" . PHP_VERSION . "\r\n";
+ "User-Agent: PEAR/1.4.9/PHP/" . PHP_VERSION . "\r\n";
if (isset($this)) { // only pass in authentication for non-static calls
$username = $config->get('username');
$password = $config->get('password');
@@ -1507,4 +1507,4 @@
}
// }}}
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewcvs.cgi/php-src/pear/PEAR/REST.php?r1=1.1.2.2&r2=1.1.2.3&diff_format=u
Index: php-src/pear/PEAR/REST.php
diff -u php-src/pear/PEAR/REST.php:1.1.2.2 php-src/pear/PEAR/REST.php:1.1.2.3
--- php-src/pear/PEAR/REST.php:1.1.2.2 Mon May 22 10:19:33 2006
+++ php-src/pear/PEAR/REST.php Mon May 22 11:17:01 2006
@@ -15,7 +15,7 @@
* @author Greg Beaver <[EMAIL PROTECTED]>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: REST.php,v 1.1.2.2 2006/05/22 10:19:33 cellog Exp $
+ * @version CVS: $Id: REST.php,v 1.1.2.3 2006/05/22 11:17:01 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -323,7 +323,7 @@
$ifmodifiedsince = ($lastmodified ? "If-Modified-Since:
$lastmodified\r\n" : '');
}
$request .= "Host: $host:$port\r\n" . $ifmodifiedsince .
- "User-Agent: PEAR/@package_version@/PHP/" . PHP_VERSION . "\r\n";
+ "User-Agent: PEAR/1.4.9/PHP/" . PHP_VERSION . "\r\n";
$username = $this->config->get('username');
$password = $this->config->get('password');
if ($username && $password) {
@@ -394,4 +394,4 @@
return $data;
}
}
-?>
\ No newline at end of file
+?>
http://cvs.php.net/viewcvs.cgi/php-src/pear/PEAR/PackageFile/v2/Validator.php?r1=1.1.2.4&r2=1.1.2.5&diff_format=u
Index: php-src/pear/PEAR/PackageFile/v2/Validator.php
diff -u php-src/pear/PEAR/PackageFile/v2/Validator.php:1.1.2.4
php-src/pear/PEAR/PackageFile/v2/Validator.php:1.1.2.5
--- php-src/pear/PEAR/PackageFile/v2/Validator.php:1.1.2.4 Mon May 22
10:19:34 2006
+++ php-src/pear/PEAR/PackageFile/v2/Validator.php Mon May 22 11:17:02 2006
@@ -17,7 +17,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: Validator.php,v 1.1.2.4 2006/05/22 10:19:34 cellog Exp $
+// $Id: Validator.php,v 1.1.2.5 2006/05/22 11:17:02 cellog Exp $
/**
* Private validation class used by PEAR_PackageFile_v2 - do not use directly,
its
* sole purpose is to split up the PEAR/PackageFile/v2.php file to make it
smaller
@@ -107,7 +107,7 @@
isset($test['dependencies']['required']) &&
isset($test['dependencies']['required']['pearinstaller']) &&
isset($test['dependencies']['required']['pearinstaller']['min'])
&&
- version_compare('@package_version@',
+ version_compare('1.4.9',
$test['dependencies']['required']['pearinstaller']['min'],
'<')) {
$this->_pearVersionTooLow($test['dependencies']['required']['pearinstaller']['min']);
return false;
@@ -1284,7 +1284,7 @@
$this->_stack->push(__FUNCTION__, 'error',
array('version' => $version),
'This package.xml requires PEAR version %version% to parse
properly, we are ' .
- 'version @package_version@');
+ 'version 1.4.9');
}
function _invalidTagOrder($oktags, $actual, $root)
@@ -1996,4 +1996,4 @@
return $providesret;
}
}
-?>
\ No newline at end of file
+?>
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
