From c05dfddda4d44ed83b6d6e8943fb7c63e601de47 Mon Sep 17 00:00:00 2001 From: Greg Beaver Date: Mon, 17 Nov 2003 05:45:49 +0000 Subject: [PATCH] fix bug #249 --- pear/PEAR/Installer.php | 18 ++++++++++++++++++ pear/package-PEAR.xml | 3 ++- 2 files changed, 20 insertions(+), 1 deletion(-) diff --git a/pear/PEAR/Installer.php b/pear/PEAR/Installer.php index 3155cde0c2..a8e92aceb8 100644 --- a/pear/PEAR/Installer.php +++ b/pear/PEAR/Installer.php @@ -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"); } diff --git a/pear/package-PEAR.xml b/pear/package-PEAR.xml index 1c2ae32e40..dddbc09c42 100644 --- a/pear/package-PEAR.xml +++ b/pear/package-PEAR.xml @@ -48,12 +48,13 @@ 1.3b4 - 2003-10-30 + 2003-11-17 beta PEAR Installer: * Bug #171 --alldeps with a rel="eq" should install the required version, if possible +* Bug #249 installing from an url doesnt work -- 2.50.1