cvs: php-src(PHP_4_3) /pear/PEAR Downloader.php Installer.php

From: Date: Sun, 29 Feb 2004 15:59:18 +0000
Subject: cvs: php-src(PHP_4_3) /pear/PEAR Downloader.php Installer.php
Groups: php.pear.cvs php.pear.core 
Request: Send a blank email to pear-core+get-136@lists.php.net to get a copy of this message
avsm Sun Feb 29 10:59:18 2004 EDT Modified files: (Branch: PHP_4_3) /php-src/pear/PEAR Downloader.php Installer.php Log: MFH 'pear install -R' fix, ilia@ ok http://cvs.php.net/diff.php/php-src/pear/PEAR/Downloader.php?r1=1.9.2.5&r2=1.9.2.6&ty=u Index: php-src/pear/PEAR/Downloader.php diff -u php-src/pear/PEAR/Downloader.php:1.9.2.5 php-src/pear/PEAR/Downloader.php:1.9.2.6 --- php-src/pear/PEAR/Downloader.php:1.9.2.5 Sun Jan 25 20:26:46 2004 +++ php-src/pear/PEAR/Downloader.php Sun Feb 29 10:59:18 2004 @@ -18,7 +18,7 @@ // | Martin Jansen <mj@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Downloader.php,v 1.9.2.5 2004/01/26 01:26:46 pajoye Exp $ +// $Id: Downloader.php,v 1.9.2.6 2004/02/29 15:59:18 avsm Exp $ require_once 'PEAR/Common.php'; require_once 'PEAR/Registry.php'; @@ -613,6 +613,20 @@ } // }}} + // {{{ _prependPath($path, $prepend) + + function _prependPath($path, $prepend) + { + if (strlen($prepend) > 0) { + if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) { + $path = $prepend . substr($path, 2); + } else { + $path = $prepend . $path; + } + } + return $path; + } + // }}} // {{{ pushError($errmsg, $code) /** http://cvs.php.net/diff.php/php-src/pear/PEAR/Installer.php?r1=1.81.2.23&r2=1.81.2.24&ty=u Index: php-src/pear/PEAR/Installer.php diff -u php-src/pear/PEAR/Installer.php:1.81.2.23 php-src/pear/PEAR/Installer.php:1.81.2.24 --- php-src/pear/PEAR/Installer.php:1.81.2.23 Sun Jan 25 20:26:46 2004 +++ php-src/pear/PEAR/Installer.php Sun Feb 29 10:59:18 2004 @@ -18,7 +18,7 @@ // | Martin Jansen <mj@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Installer.php,v 1.81.2.23 2004/01/26 01:26:46 pajoye Exp $ +// $Id: Installer.php,v 1.81.2.24 2004/02/29 15:59:18 avsm Exp $ require_once 'PEAR/Common.php'; require_once 'PEAR/Registry.php'; @@ -540,21 +540,6 @@ } // }}} - // {{{ _prependPath($path, $prepend) - - function _prependPath($path, $prepend) - { - if (strlen($prepend) > 0) { - if (OS_WINDOWS && preg_match('/^[a-z]:/i', $path)) { - $path = $prepend . substr($path, 2); - } else { - $path = $prepend . $path; - } - } - return $path; - } - - // }}} // {{{ download() /**

« previous php.pear.core (#136) next »