Browse Source

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'
PEAR_1_4DEV
Anil Madhavapeddy 23 years ago
parent
commit
b49e8fe865
  1. 14
      pear/PEAR/Downloader.php
  2. 15
      pear/PEAR/Installer.php

14
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)

15
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()

Loading…
Cancel
Save