cvs: php4 /pear/PEAR Installer.php
| From: | Tomas V.V.Cox | Date: | Tue, 21 May 2002 02:11:43 +0000 |
| Subject: | cvs: php4 /pear/PEAR Installer.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-3996@lists.php.net to get a copy of this message | ||
cox Mon May 20 22:11:43 2002 EDT
Modified files:
/php4/pear/PEAR Installer.php
Log:
Make the installation of a package fail when _installFile
fails and "force" is not set
Index: php4/pear/PEAR/Installer.php
diff -u php4/pear/PEAR/Installer.php:1.57 php4/pear/PEAR/Installer.php:1.58
--- php4/pear/PEAR/Installer.php:1.57 Mon May 20 06:44:53 2002
+++ php4/pear/PEAR/Installer.php Mon May 20 22:11:42 2002
@@ -17,7 +17,7 @@
// | Tomas V.V.Cox <cox@idecnet.com> |
// +----------------------------------------------------------------------+
//
-// $Id: Installer.php,v 1.57 2002/05/20 10:44:53 ssb Exp $
+// $Id: Installer.php,v 1.58 2002/05/21 02:11:42 cox Exp $
require_once 'PEAR/Common.php';
require_once 'PEAR/Registry.php';
@@ -445,7 +445,10 @@
// <== XXX This part should be removed later on
foreach ($pkginfo['filelist'] as $file => $atts) {
- $this->_installFile($file, $atts, $tmp_path);
+ $res = $this->_installFile($file, $atts, $tmp_path);
+ if (!$res && empty($options['force'])) {
+ return null;
+ }
}
}