This commit is contained in:
Greg Beaver 2003-11-17 05:45:49 +00:00
parent 5757ae3d24
commit c05dfddda4
2 changed files with 20 additions and 1 deletions

View File

@ -731,6 +731,24 @@ class PEAR_Installer extends PEAR_Common
if (!is_file($pkgfile)) {
$origpkgfile = $pkgfile;
$pkgfile = $this->extractDownloadFileName($pkgfile, $version);
if (preg_match('#^(http|ftp)://#', $pkgfile)) {
$pkgfile = $this->_downloadFile($pkgfile, $config, $options,
$errors, $version, $origpkgfile,
$state);
if (PEAR::isError($pkgfile)) {
return $pkgfile;
}
$tempinfo = $this->infoFromAny($pkgfile);
if (isset($options['alldeps']) || isset($options['onlyreqdeps'])) {
// ignore dependencies if there are any errors
if (!PEAR::isError($tempinfo)) {
$mywillinstall[strtolower($tempinfo['package'])] = @$tempinfo['release_deps'];
}
}
$installpackages[] = array('pkg' => $tempinfo['package'],
'file' => $pkgfile, 'info' => $tempinfo);
continue;
}
if (!$this->validPackageName($pkgfile)) {
return $this->raiseError("Package name '$pkgfile' not valid");
}

View File

@ -48,12 +48,13 @@
</maintainers>
<release>
<version>1.3b4</version>
<date>2003-10-30</date>
<date>2003-11-17</date>
<state>beta</state>
<notes>
PEAR Installer:
* Bug #171 --alldeps with a rel=&quot;eq&quot; should install the required version, if possible
* Bug #249 installing from an url doesnt work
</notes>
<provides type="class" name="OS_Guess" />