cellog Mon Apr 25 01:43:09 2005 EDT
Modified files:
/pear-core/PEAR Downloader.php
/pear-core/PEAR/PackageFile v1.php v2.php
/pear-core/PEAR/REST 10.php
Log:
add stability to get*DownloadURL returns from REST for
error message purposes
fix --force option for get*DownloadURL
http://cvs.php.net/diff.php/pear-core/PEAR/Downloader.php?r1=1.74&r2=1.75&ty=u
Index: pear-core/PEAR/Downloader.php
diff -u pear-core/PEAR/Downloader.php:1.74 pear-core/PEAR/Downloader.php:1.75
--- pear-core/PEAR/Downloader.php:1.74 Mon Apr 25 00:03:04 2005
+++ pear-core/PEAR/Downloader.php Mon Apr 25 01:43:08 2005
@@ -18,7 +18,7 @@
* @author Martin Jansen <mj@xxxxxxx>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: Downloader.php,v 1.74 2005/04/25 04:03:04 cellog Exp $
+ * @version CVS: $Id: Downloader.php,v 1.75 2005/04/25 05:43:08 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.3.0
*/
@@ -647,6 +647,7 @@
}
$pf->setRawPackage($url['package']);
$pf->setDeps($url['info']);
+ $pf->setRawState($url['stability']);
$url['info'] = &$pf;
if (!extension_loaded("zlib") ||
isset($this->_options['nocompress'])) {
$ext = '.tar';
@@ -766,6 +767,7 @@
}
$pf->setRawPackage($url['package']);
$pf->setDeps($url['info']);
+ $pf->setRawState($url['stability']);
$url['info'] = &$pf;
if (!extension_loaded("zlib") ||
isset($this->_options['nocompress'])) {
$ext = '.tar';
http://cvs.php.net/diff.php/pear-core/PEAR/PackageFile/v1.php?r1=1.52&r2=1.53&ty=u
Index: pear-core/PEAR/PackageFile/v1.php
diff -u pear-core/PEAR/PackageFile/v1.php:1.52
pear-core/PEAR/PackageFile/v1.php:1.53
--- pear-core/PEAR/PackageFile/v1.php:1.52 Sun Apr 24 21:55:58 2005
+++ pear-core/PEAR/PackageFile/v1.php Mon Apr 25 01:43:08 2005
@@ -15,7 +15,7 @@
* @author Greg Beaver <cellog@xxxxxxx>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: v1.php,v 1.52 2005/04/25 01:55:58 cellog Exp $
+ * @version CVS: $Id: v1.php,v 1.53 2005/04/25 05:43:08 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -610,6 +610,11 @@
return false;
}
+ function setRawState($state)
+ {
+ $this->_packageInfo['release_state'] = $state;
+ }
+
function setState($state)
{
$this->_packageInfo['release_state'] = $state;
http://cvs.php.net/diff.php/pear-core/PEAR/PackageFile/v2.php?r1=1.95&r2=1.96&ty=u
Index: pear-core/PEAR/PackageFile/v2.php
diff -u pear-core/PEAR/PackageFile/v2.php:1.95
pear-core/PEAR/PackageFile/v2.php:1.96
--- pear-core/PEAR/PackageFile/v2.php:1.95 Sun Apr 24 21:55:58 2005
+++ pear-core/PEAR/PackageFile/v2.php Mon Apr 25 01:43:08 2005
@@ -15,7 +15,7 @@
* @author Greg Beaver <cellog@xxxxxxx>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: v2.php,v 1.95 2005/04/25 01:55:58 cellog Exp $
+ * @version CVS: $Id: v2.php,v 1.96 2005/04/25 05:43:08 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -326,6 +326,14 @@
/**
* WARNING - do not use this function unless you know what you're doing
*/
+ function setRawState($state)
+ {
+ $this->_packageInfo['stability']['release'] = $state;
+ }
+
+ /**
+ * WARNING - do not use this function unless you know what you're doing
+ */
function setRawPackage($package)
{
$this->_packageInfo['name'] = $package;
http://cvs.php.net/diff.php/pear-core/PEAR/REST/10.php?r1=1.7&r2=1.8&ty=u
Index: pear-core/PEAR/REST/10.php
diff -u pear-core/PEAR/REST/10.php:1.7 pear-core/PEAR/REST/10.php:1.8
--- pear-core/PEAR/REST/10.php:1.7 Mon Apr 25 01:20:16 2005
+++ pear-core/PEAR/REST/10.php Mon Apr 25 01:43:09 2005
@@ -15,7 +15,7 @@
* @author Greg Beaver <cellog@xxxxxxx>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt PHP License 3.0
- * @version CVS: $Id: 10.php,v 1.7 2005/04/25 05:20:16 cellog Exp $
+ * @version CVS: $Id: 10.php,v 1.8 2005/04/25 05:43:09 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a12
*/
@@ -73,7 +73,8 @@
$info['r'] = array($info['r']);
}
foreach ($info['r'] as $release) {
- if ($installed && version_compare($release['v'], $installed, '<'))
{
+ if (!isset($this->_rest->_options['force']) && ($installed &&
+ version_compare($release['v'], $installed, '<'))) {
continue;
}
if (isset($state)) {
@@ -164,7 +165,8 @@
$info['r'] = array($info['r']);
}
foreach ($info['r'] as $release) {
- if ($installed && version_compare($release['v'], $installed, '<'))
{
+ if (!isset($this->_rest->_options['force']) && ($installed &&
+ version_compare($release['v'], $installed, '<'))) {
continue;
}
if (in_array($release['v'], $exclude)) { // skip excluded versions
@@ -225,6 +227,7 @@
array('version' => $releaseinfo['v'],
'info' => unserialize($packagexml),
'package' => $releaseinfo['p']['_content'],
+ 'stability' => $releaseinfo['st'],
'url' => $releaseinfo['g']);
} else {
$release = $info['r'][0];
@@ -233,14 +236,15 @@
if (PEAR::isError($releaseinfo)) {
return $releaseinfo;
}
- $packagexml = unserialize($this->_rest->retrieveData($base . 'r/'
. strtolower($package) . '/' .
- 'deps.' . $release['v'] . '.txt', false, true));
+ $packagexml = $this->_rest->retrieveData($base . 'r/' .
strtolower($package) . '/' .
+ 'deps.' . $release['v'] . '.txt', false, true);
if (PEAR::isError($packagexml)) {
return $packagexml;
}
return
array('version' => $releaseinfo['v'],
'package' => $releaseinfo['p']['_content'],
+ 'stability' => $releaseinfo['st'],
'info' => unserialize($packagexml));
}
}
--
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
|
