cvs: php4 /pear install-pear.php
| From: | Tomas V.V.Cox | Date: | Sun, 09 Jun 2002 16:29:50 +0000 |
| Subject: | cvs: php4 /pear install-pear.php | ||
| Groups: | php.pear.cvs | ||
| Request: | Send a blank email to pear-cvs+get-4510@lists.php.net to get a copy of this message | ||
cox Sun Jun 9 12:29:50 2002 EDT
Modified files:
/php4/pear install-pear.php
Log:
displayLine() -> outputData()
Index: php4/pear/install-pear.php
diff -u php4/pear/install-pear.php:1.2 php4/pear/install-pear.php:1.3
--- php4/pear/install-pear.php:1.2 Sun May 26 08:13:05 2002
+++ php4/pear/install-pear.php Sun Jun 9 12:29:50 2002
@@ -55,7 +55,7 @@
if ($reg->packageExists($package)) {
$info = $installer->infoFromAny($instfile);
if (PEAR::isError($info)) {
- $ui->displayLine(sprintf("[PEAR] %s: %s", $package,
$info->getMessage()));
+ $ui->outputData(sprintf("[PEAR] %s: %s", $package,
$info->getMessage()));
continue;
}
$new_ver = $info['version'];
@@ -63,30 +63,30 @@
if (version_compare($new_ver, $old_ver, 'gt')) {
$err = $installer->install($instfile, array('upgrade' => true));
if (PEAR::isError($err)) {
- $ui->displayLine(sprintf("[PEAR] %s: %s", $package,
$err->getMessage()));
+ $ui->outputData(sprintf("[PEAR] %s: %s", $package,
$err->getMessage()));
continue;
}
- $ui->displayLine(sprintf("[PEAR] %-15s- upgraded: %s", $package,
$new_ver));
+ $ui->outputData(sprintf("[PEAR] %-15s- upgraded: %s", $package,
$new_ver));
} else {
if (@$argv[1] == '--force') {
$err = $installer->install($instfile, array('force' => true));
if (PEAR::isError($err)) {
- $ui->displayLine(sprintf("[PEAR] %s: %s", $package,
$err->getMessage()));
+ $ui->outputData(sprintf("[PEAR] %s: %s", $package,
$err->getMessage()));
continue;
}
- $ui->displayLine(sprintf("[PEAR] %-15s- installed: %s", $package,
$new_ver));
+ $ui->outputData(sprintf("[PEAR] %-15s- installed: %s", $package,
$new_ver));
} else {
- $ui->displayLine(sprintf("[PEAR] %-15s- already installed: %s",
$package, $old_ver));
+ $ui->outputData(sprintf("[PEAR] %-15s- already installed: %s",
$package, $old_ver));
}
}
} else {
$err = $installer->install($instfile);
if (PEAR::isError($err)) {
- $ui->displayLine(sprintf("[PEAR] %s: %s", $package,
$err->getMessage()));
+ $ui->outputData(sprintf("[PEAR] %s: %s", $package,
$err->getMessage()));
continue;
}
$new_ver = $reg->packageInfo($package, 'version');
- $ui->displayLine(sprintf("[PEAR] %-15s- installed: %s", $package, $new_ver));
+ $ui->outputData(sprintf("[PEAR] %-15s- installed: %s", $package, $new_ver));
}
}