mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix bugs found in unit-testing, one BC issue also

Browse Source
This commit is contained in:
Greg Beaver 2003-12-04 01:22:50 +00:00
parent 2ab2d8263c
commit 1558f748e3
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
pear/PEAR/Downloader.php
View File

@ -294,16 +294,34 @@ class PEAR_Downloader extends PEAR_Common
/** /**
* Download any files and their dependencies, if necessary * Download any files and their dependencies, if necessary
* *
* BC-compatible method name
* @param array a mixed list of package names, local files, or package.xml * @param array a mixed list of package names, local files, or package.xml
*/ */
function download($packages) function download($packages)
{
return $this->doDownload($packages);
}
// }}}
// {{{ doDownload()
/**
* Download any files and their dependencies, if necessary
*
* @param array a mixed list of package names, local files, or package.xml
*/
function doDownload($packages)
{ {
$mywillinstall = array(); $mywillinstall = array();
$state = $this->_preferredState; $state = $this->_preferredState;
// {{{ download files in this list if necessary // {{{ download files in this list if necessary
foreach($packages as $pkgfile) { foreach($packages as $pkgfile) {
$need_download = false;
if (!is_file($pkgfile)) { if (!is_file($pkgfile)) {
if (preg_match('#^(http|ftp)://#', $pkgfile)) {
$need_download = true;
}
$pkgfile = $this->_downloadNonFile($pkgfile); $pkgfile = $this->_downloadNonFile($pkgfile);
if (PEAR::isError($pkgfile)) { if (PEAR::isError($pkgfile)) {
return $pkgfile; return $pkgfile;
@ -312,7 +330,11 @@ class PEAR_Downloader extends PEAR_Common
continue; continue;
} }
} // end is_file() } // end is_file()
$tempinfo = $this->infoFromAny($pkgfile); $tempinfo = $this->infoFromAny($pkgfile);
if ($need_download) {
$this->_toDownload[] = $tempinfo['package'];
}
if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) { if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
// ignore dependencies if there are any errors // ignore dependencies if there are any errors
if (!PEAR::isError($tempinfo)) { if (!PEAR::isError($tempinfo)) {
@ -349,17 +371,7 @@ class PEAR_Downloader extends PEAR_Common
} }
if (count($deppackages)) { if (count($deppackages)) {
// check dependencies' dependencies $this->doDownload($deppackages);
// combine the list of packages to install
$temppack = array();
foreach($this->_downloadedPackages as $p) {
$temppack[] = strtolower($p['info']['package']);
}
foreach($deppackages as $pack) {
$temppack[] = strtolower($pack);
}
$this->_toDownload = array_merge($this->_toDownload, $temppack);
$this->download($deppackages);
} }
} // }}} if --alldeps or --onlyreqdeps } // }}} if --alldeps or --onlyreqdeps
} }
@ -379,20 +391,7 @@ class PEAR_Downloader extends PEAR_Common
$state = null; $state = null;
$pkgfile = $this->extractDownloadFileName($pkgfile, $version); $pkgfile = $this->extractDownloadFileName($pkgfile, $version);
if (preg_match('#^(http|ftp)://#', $pkgfile)) { if (preg_match('#^(http|ftp)://#', $pkgfile)) {
$pkgfile = $this->_downloadFile($pkgfile, $version, $origpkgfile); return $this->_downloadFile($pkgfile, $version, $origpkgfile);
if (PEAR::isError($pkgfile)) {
return $pkgfile;
}
$tempinfo = $this->infoFromAny($pkgfile);
if (isset($this->_options['alldeps']) || isset($this->_options['onlyreqdeps'])) {
// ignore dependencies if there are any errors
if (!PEAR::isError($tempinfo)) {
$mywillinstall[strtolower($tempinfo['package'])] = @$tempinfo['release_deps'];
}
}
$this->_downloadedPackages[] = array('pkg' => $tempinfo['package'],
'file' => $pkgfile, 'info' => $tempinfo);
return false;
} }
if (!$this->validPackageName($pkgfile)) { if (!$this->validPackageName($pkgfile)) {
return $this->raiseError("Package name '$pkgfile' not valid"); return $this->raiseError("Package name '$pkgfile' not valid");
@ -404,6 +403,9 @@ class PEAR_Downloader extends PEAR_Common
$this->log(0, "Package '{$curinfo['package']}' already installed, skipping"); $this->log(0, "Package '{$curinfo['package']}' already installed, skipping");
return false; return false;
} }
if (in_array($pkgfile, $this->_toDownload)) {
return false;
}
$releases = $this->_remote->call('package.info', $pkgfile, 'releases'); $releases = $this->_remote->call('package.info', $pkgfile, 'releases');
if (!count($releases)) { if (!count($releases)) {
return $this->raiseError("No releases found for package '$pkgfile'"); return $this->raiseError("No releases found for package '$pkgfile'");
@ -460,6 +462,7 @@ class PEAR_Downloader extends PEAR_Common
return false; return false;
} }
} }
$this->_toDownload[] = $pkgfile;
return $this->_downloadFile($pkgfile, $version, $origpkgfile, $state); return $this->_downloadFile($pkgfile, $version, $origpkgfile, $state);
} }