cvs: pear-core /PEAR/Command Install.php

cellog Sat May 19 23:51:30 2007 UTC

Modified files:
/pear-core/PEAR/Command Install.php
Log:
fix Bug #10997 Placement of feature package notices

http://cvs.php.net/viewvc.cgi/pear-c...&diff_format=u
Index: pear-core/PEAR/Command/Install.php
diff -u pear-core/PEAR/Command/Install.php:1.129 pear-core/PEAR/Command/Install.php:1.130
--- pear-core/PEAR/Command/Install.php:1.129 Sun May 6 23:25:08 2007
+++ pear-core/PEAR/Command/Install.php Sat May 19 23:51:30 2007
@@ -16,7 +16,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2006 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Install.php,v 1.129 2007/05/06 23:25:08 cellog Exp $
+ * @version CVS: $Id: Install.php,v 1.130 2007/05/19 23:51:30 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -765,11 +765,12 @@
// explicitly chooses to install another group
continue;
}
- $this->ui->outputData($param->getPackage() . ': Optional feature ' .
+ $extrainfo[] = $param->getPackage() . ': Optional feature ' .
$group['attribs']['name'] . ' available (' .
- $group['attribs']['hint'] . ')');
+ $group['attribs']['hint'] . ')';
}
- $extrainfo[] = 'To install use "pear install ' .
+ $extrainfo[] = $param->getPackage() .
+ ': To install optional features use "pear install ' .
$reg->parsedPackageNameToString(
array('package' => $param->getPackage(),
'channel' => $param->getChannel()), true) .
@@ -787,7 +788,8 @@
foreach ($list as $file) {
$extrainfo[] = $file;
}
- $extrainfo[] = 'Use "pear run-scripts ' . $pn . '" to run';
+ $extrainfo[] = $param->getPackage() .
+ ': Use "pear run-scripts ' . $pn . '" to finish setup.';
$extrainfo[] = 'DO NOT RUN SCRIPTS FROM UNTRUSTED SOURCES';
}
}