cvs: php-src /pear/PEAR Downloader.php Installer.php

From: Date: Sun, 29 Feb 2004 15:58:18 +0000
Subject: cvs: php-src /pear/PEAR Downloader.php Installer.php
Groups: php.pear.cvs php.pear.core 
Request: Send a blank email to pear-core+get-135@lists.php.net to get a copy of this message
avsm Sun Feb 29 10:58:18 2004 EDT Modified files: /php-src/pear/PEAR Downloader.php Installer.php Log: Move the _prependPath function into PEAR_Downloader from PEAR_Installer, as PEAR_Downloader uses it (and PEAR_Installer inherits PEAR_Downloader). Unbreaks 'pear install -R' http://cvs.php.net/diff.php/php-src/pear/PEAR/Downloader.php?r1=1.13&r2=1.14&ty=u Index: php-src/pear/PEAR/Downloader.php diff -u php-src/pear/PEAR/Downloader.php:1.13 php-src/pear/PEAR/Downloader.php:1.14 --- php-src/pear/PEAR/Downloader.php:1.13 Thu Jan 8 12:33:12 2004 +++ php-src/pear/PEAR/Downloader.php Sun Feb 29 10:58:17 2004 @@ -18,7 +18,7 @@ // | Martin Jansen <mj@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Downloader.php,v 1.13 2004/01/08 17:33:12 sniper Exp $ +// $Id: Downloader.php,v 1.14 2004/02/29 15:58:17 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.147&r2=1.148&ty=u Index: php-src/pear/PEAR/Installer.php diff -u php-src/pear/PEAR/Installer.php:1.147 php-src/pear/PEAR/Installer.php:1.148 --- php-src/pear/PEAR/Installer.php:1.147 Thu Jan 8 12:33:12 2004 +++ php-src/pear/PEAR/Installer.php Sun Feb 29 10:58:17 2004 @@ -18,7 +18,7 @@ // | Martin Jansen <mj@php.net> | // +----------------------------------------------------------------------+ // -// $Id: Installer.php,v 1.147 2004/01/08 17:33:12 sniper Exp $ +// $Id: Installer.php,v 1.148 2004/02/29 15:58:17 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 (#135) next »