diff options
Diffstat (limited to 'pear/PEAR/Builder.php')
| -rw-r--r-- | pear/PEAR/Builder.php | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/pear/PEAR/Builder.php b/pear/PEAR/Builder.php index c778623869..13c3f36f60 100644 --- a/pear/PEAR/Builder.php +++ b/pear/PEAR/Builder.php @@ -5,10 +5,10 @@ // +----------------------------------------------------------------------+ // | Copyright (c) 1997-2003 The PHP Group | // +----------------------------------------------------------------------+ -// | This source file is subject to version 2.02 of the PHP license, | +// | This source file is subject to version 3.0 of the PHP license, | // | that is bundled with this package in the file LICENSE, and is | -// | available at through the world-wide-web at | -// | http://www.php.net/license/2_02.txt. | +// | available through the world-wide-web at the following url: | +// | http://www.php.net/license/3_0.txt. | // | If you did not receive a copy of the PHP license and are unable to | // | obtain it through the world-wide-web, please send a note to | // | license@php.net so we can mail you a copy immediately. | @@ -310,7 +310,7 @@ class PEAR_Builder extends PEAR_Common if ($what != 'cmdoutput') { return; } - $this->log(3, rtrim($data)); + $this->log(1, rtrim($data)); if (preg_match('/You should update your .aclocal.m4/', $data)) { return; } @@ -320,8 +320,8 @@ class PEAR_Builder extends PEAR_Common $apino = (int)$matches[2]; if (isset($this->$member)) { $this->$member = $apino; - $msg = sprintf("%-22s : %d", $matches[1], $apino); - $this->log(1, $msg); + //$msg = sprintf("%-22s : %d", $matches[1], $apino); + //$this->log(1, $msg); } } } @@ -352,6 +352,11 @@ class PEAR_Builder extends PEAR_Common if (!$pp) { return $this->raiseError("failed to run `$command'"); } + if ($callback && $callback[0]->debug == 1) { + $olddbg = $callback[0]->debug; + $callback[0]->debug = 2; + } + while ($line = fgets($pp, 1024)) { if ($callback) { call_user_func($callback, 'cmdoutput', $line); @@ -359,6 +364,9 @@ class PEAR_Builder extends PEAR_Common $this->log(2, rtrim($line)); } } + if ($callback && isset($olddbg)) { + $callback[0]->debug = $olddbg; + } $exitcode = @pclose($pp); return ($exitcode == 0); } |