mirror of
https://github.com/php/php-src.git
synced 2026-04-17 21:11:02 +02:00
reverting accidental commit of my fix for #25008 - we'll let Tomas review the patch I submitted (oops). The other stuff was good.
This commit is contained in:
@@ -222,10 +222,6 @@ class PEAR_Installer extends PEAR_Common
|
||||
$this->log(3, "+ mkdir $dest_dir");
|
||||
}
|
||||
if (empty($atts['replacements'])) {
|
||||
if (!file_exists($orig_file)) {
|
||||
return $this->raiseError("file does not exist",
|
||||
PEAR_INSTALLER_FAILED);
|
||||
}
|
||||
if (!@copy($orig_file, $dest_file)) {
|
||||
return $this->raiseError("failed to write $dest_file",
|
||||
PEAR_INSTALLER_FAILED);
|
||||
@@ -235,10 +231,6 @@ class PEAR_Installer extends PEAR_Common
|
||||
$md5sum = md5_file($dest_file);
|
||||
}
|
||||
} else {
|
||||
if (!file_exists($orig_file)) {
|
||||
return $this->raiseError("file does not exist",
|
||||
PEAR_INSTALLER_FAILED);
|
||||
}
|
||||
$fp = fopen($orig_file, "r");
|
||||
$contents = fread($fp, filesize($orig_file));
|
||||
fclose($fp);
|
||||
@@ -703,9 +695,6 @@ class PEAR_Installer extends PEAR_Common
|
||||
if (PEAR::isError($res)) {
|
||||
if (empty($options['ignore-errors'])) {
|
||||
$this->rollbackFileTransaction();
|
||||
if ($res->getMessage() == "file does not exist") {
|
||||
$this->raiseError("file $file in package.xml does not exist");
|
||||
}
|
||||
return $this->raiseError($res);
|
||||
} else {
|
||||
$this->log(0, "Warning: " . $res->getMessage());
|
||||
|
||||
Reference in New Issue
Block a user