php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-13 02:52:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix bug in --force - $options was never passed to _installFile.

Browse Source 
add PHPDoc
This commit is contained in:
Greg Beaver
2003-09-04 22:29:21 +00:00
parent 8a70f5c01c
commit 0ad60ebf3b
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pear/PEAR/Installer.php
View File

@@ -155,7 +155,14 @@ class PEAR_Installer extends PEAR_Common
// }}}
// {{{ _installFile()
function _installFile($file, $atts, $tmp_path)
/**
* @param string filename
* @param array attributes from <file> tag in package.xml
* @param string path to install the file in
* @param array options from command-line
* @access private
*/
function _installFile($file, $atts, $tmp_path, $options)
{
static $os;
if (isset($atts['platform'])) {
@@ -284,6 +291,7 @@ class PEAR_Installer extends PEAR_Common
if (strtolower($md5sum) == strtolower($atts['md5sum'])) {
$this->log(3, "md5sum ok: $final_dest_file");
} else {
var_dump($options);
if (empty($options['force'])) {
return $this->raiseError("bad md5sum for file $final_dest_file",
PEAR_INSTALLER_FAILED);
@@ -928,7 +936,7 @@ class PEAR_Installer extends PEAR_Common
foreach ($pkginfo['filelist'] as $file => $atts) {
$this->expectError(PEAR_INSTALLER_FAILED);
$res = $this->_installFile($file, $atts, $tmp_path);
$res = $this->_installFile($file, $atts, $tmp_path, $options);
$this->popExpect();
if (PEAR::isError($res)) {
if (empty($options['ignore-errors'])) {