cvs: pear-core / package-PEAR.xml package2.xml /PEAR Dependency2.php /PEAR/Command Install-init.php Install.php
| From: | Greg Beaver | Date: | Wed, 26 Oct 2005 19:37:15 +0000 |
| Subject: | cvs: pear-core / package-PEAR.xml package2.xml /PEAR Dependency2.php /PEAR/Command Install-init.php Install.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-cvs+get-35882@lists.php.net to get a copy of this message | ||
cellog Wed Oct 26 15:37:15 2005 EDT
Modified files:
/pear-core package2.xml package-PEAR.xml
/pear-core/PEAR/Command Install.php Install-init.php
/pear-core/PEAR Dependency2.php
Log:
* implement --loose option to avoid recommended version validation
http://cvs.php.net/diff.php/pear-core/package2.xml?r1=1.187&r2=1.188&ty=u
Index: pear-core/package2.xml
diff -u pear-core/package2.xml:1.187 pear-core/package2.xml:1.188
--- pear-core/package2.xml:1.187 Wed Oct 26 15:33:09 2005
+++ pear-core/package2.xml Wed Oct 26 15:37:13 2005
@@ -87,6 +87,7 @@
as well
* implement SERIOUS improvement in list-all/remote-list speed. From 6 minutes
down to about 16-30 seconds
+ * implement --loose option to avoid recommended version validation
* implement Request #5527: alternative approach to determining glibc version
* fix Bug #5717: analyzeSourceCode() fails to process certain
quote situations properly
http://cvs.php.net/diff.php/pear-core/package-PEAR.xml?r1=1.295&r2=1.296&ty=u
Index: pear-core/package-PEAR.xml
diff -u pear-core/package-PEAR.xml:1.295 pear-core/package-PEAR.xml:1.296
--- pear-core/package-PEAR.xml:1.295 Wed Oct 26 15:33:08 2005
+++ pear-core/package-PEAR.xml Wed Oct 26 15:37:13 2005
@@ -82,6 +82,7 @@
as well
* implement SERIOUS improvement in list-all/remote-list speed. From 6 minutes
down to about 16-30 seconds
+ * implement --loose option to avoid recommended version validation
* implement Request #5527: alternative approach to determining glibc version
* fix Bug #5717: analyzeSourceCode() fails to process certain
quote situations properly
http://cvs.php.net/diff.php/pear-core/PEAR/Command/Install.php?r1=1.108&r2=1.109&ty=u
Index: pear-core/PEAR/Command/Install.php
diff -u pear-core/PEAR/Command/Install.php:1.108 pear-core/PEAR/Command/Install.php:1.109
--- pear-core/PEAR/Command/Install.php:1.108 Sun Sep 25 16:27:27 2005
+++ pear-core/PEAR/Command/Install.php Wed Oct 26 15:37:14 2005
@@ -16,7 +16,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt
PHP License 3.0
- * @version CVS: $Id: Install.php,v 1.108 2005/09/25 20:27:27 cellog Exp $
+ * @version CVS: $Id: Install.php,v 1.109 2005/10/26 19:37:14 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 0.1
*/
@@ -54,6 +54,10 @@
'shortopt' => 'f',
'doc' => 'will overwrite newer installed packages',
),
+ 'loose' => array(
+ 'shortopt' => 'l',
+ 'doc' => 'do not check for recommended dependency
version',
+ ),
'nodeps' => array(
'shortopt' => 'n',
'doc' => 'ignore dependencies, install anyway',
@@ -135,6 +139,10 @@
'shortopt' => 'f',
'doc' => 'overwrite newer installed packages',
),
+ 'loose' => array(
+ 'shortopt' => 'l',
+ 'doc' => 'do not check for recommended dependency
version',
+ ),
'nodeps' => array(
'shortopt' => 'n',
'doc' => 'ignore dependencies, upgrade anyway',
@@ -215,6 +223,9 @@
'ignore-errors' => array(
'doc' => 'force install even if there were errors',
),
+ 'loose' => array(
+ 'doc' => 'do not check for recommended dependency
version',
+ ),
),
'doc' => '
Upgrades all packages that have a newer release available. Upgrades are
http://cvs.php.net/diff.php/pear-core/PEAR/Command/Install-init.php?r1=1.2&r2=1.3&ty=u
Index: pear-core/PEAR/Command/Install-init.php
diff -u pear-core/PEAR/Command/Install-init.php:1.2 pear-core/PEAR/Command/Install-init.php:1.3
--- pear-core/PEAR/Command/Install-init.php:1.2 Fri Aug 19 15:45:38 2005
+++ pear-core/PEAR/Command/Install-init.php Wed Oct 26 15:37:15 2005
@@ -10,6 +10,10 @@
'shortopt' => 'f',
'doc' => 'will overwrite newer installed packages',
),
+ 'loose' => array(
+ 'shortopt' => 'l',
+ 'doc' => 'do not check for recommended dependency
version',
+ ),
'nodeps' => array(
'shortopt' => 'n',
'doc' => 'ignore dependencies, install anyway',
@@ -91,6 +95,10 @@
'shortopt' => 'f',
'doc' => 'overwrite newer installed packages',
),
+ 'loose' => array(
+ 'shortopt' => 'l',
+ 'doc' => 'do not check for recommended dependency
version',
+ ),
'nodeps' => array(
'shortopt' => 'n',
'doc' => 'ignore dependencies, upgrade anyway',
@@ -171,6 +179,9 @@
'ignore-errors' => array(
'doc' => 'force install even if there were errors',
),
+ 'loose' => array(
+ 'doc' => 'do not check for recommended dependency
version',
+ ),
),
'doc' => '
Upgrades all packages that have a newer release available. Upgrades are
http://cvs.php.net/diff.php/pear-core/PEAR/Dependency2.php?r1=1.46&r2=1.47&ty=u
Index: pear-core/PEAR/Dependency2.php
diff -u pear-core/PEAR/Dependency2.php:1.46 pear-core/PEAR/Dependency2.php:1.47
--- pear-core/PEAR/Dependency2.php:1.46 Wed Sep 21 21:49:26 2005
+++ pear-core/PEAR/Dependency2.php Wed Oct 26 15:37:15 2005
@@ -15,7 +15,7 @@
* @author Greg Beaver <cellog@php.net>
* @copyright 1997-2005 The PHP Group
* @license http://www.php.net/license/3_0.txt
PHP License 3.0
- * @version CVS: $Id: Dependency2.php,v 1.46 2005/09/22 01:49:26 cellog Exp $
+ * @version CVS: $Id: Dependency2.php,v 1.47 2005/10/26 19:37:15 cellog Exp $
* @link http://pear.php.net/package/PEAR
* @since File available since Release 1.4.0a1
*/
@@ -816,7 +816,8 @@
}
}
}
- if (!isset($this->_options['nodeps']) &&
!isset($this->_options['force'])) {
+ if (!isset($this->_options['nodeps']) &&
!isset($this->_options['force']) &&
+ !isset($this->_options['loose'])) {
return $this->raiseError('%s dependency package "' . $depname
.
'" ' . $installed . ' version ' . $version .
' is not the recommended version ' .
$dep['recommended'] .