diff options
| author | Tomas V.V.Cox <cox@php.net> | 2002-06-09 16:29:50 +0000 |
|---|---|---|
| committer | Tomas V.V.Cox <cox@php.net> | 2002-06-09 16:29:50 +0000 |
| commit | 0d5d98a6d8494ac1ae83add6485bc2c5ceaed43d (patch) | |
| tree | da8a6d4b796a851119f8884e04503015765f7fd8 /pear | |
| parent | 76477813407eaf54f3fae993643f3d4c8ca6780b (diff) | |
| download | php-git-0d5d98a6d8494ac1ae83add6485bc2c5ceaed43d.tar.gz | |
displayLine() -> outputData()
Diffstat (limited to 'pear')
| -rw-r--r-- | pear/install-pear.php | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pear/install-pear.php b/pear/install-pear.php index 0af598add7..e5b0cad93d 100644 --- a/pear/install-pear.php +++ b/pear/install-pear.php @@ -55,7 +55,7 @@ foreach ($install_files as $package => $instfile) { 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 @@ foreach ($install_files as $package => $instfile) { 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)); } } |