From cdb852e21f7d579870eaa8f4793e3315bf5f78bc Mon Sep 17 00:00:00 2001 From: Anil Madhavapeddy Date: Sun, 29 Feb 2004 15:59:18 +0000 Subject: [PATCH] MFH 'pear install -R' fix, ilia@ ok --- pear/PEAR/Downloader.php | 14 ++++++++++++++ pear/PEAR/Installer.php | 15 --------------- 2 files changed, 14 insertions(+), 15 deletions(-) diff --git a/pear/PEAR/Downloader.php b/pear/PEAR/Downloader.php index 69c3e077ae..676e3805a0 100644 --- a/pear/PEAR/Downloader.php +++ b/pear/PEAR/Downloader.php @@ -612,6 +612,20 @@ class PEAR_Downloader extends PEAR_Common $this->ui->_downloadCallback($msg, $params); } + // }}} + // {{{ _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) diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php index 8b79ff15c9..be9339eea1 100644 --- a/pear/PEAR/Installer.php +++ b/pear/PEAR/Installer.php @@ -539,21 +539,6 @@ class PEAR_Installer extends PEAR_Downloader return parent::mkDirHier($dir); } - // }}} - // {{{ _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() -- 2.40.0