cvs: pear-core /PEAR/PackageFile v2.php
| From: | Greg Beaver | Date: | Fri, 05 Nov 2004 05:15:15 +0000 |
| Subject: | cvs: pear-core /PEAR/PackageFile v2.php | ||
| Groups: | php.pear.cvs php.pear.core | ||
| Request: | Send a blank email to pear-cvs+get-25698@lists.php.net to get a copy of this message | ||
cellog Fri Nov 5 00:15:15 2004 EDT
Modified files:
/pear-core/PEAR/PackageFile v2.php
Log:
fix add[Sub]packageDepWithURI
http://cvs.php.net/diff.php/pear-core/PEAR/PackageFile/v2.php?r1=1.45&r2=1.46&ty=u
Index: pear-core/PEAR/PackageFile/v2.php
diff -u pear-core/PEAR/PackageFile/v2.php:1.45 pear-core/PEAR/PackageFile/v2.php:1.46
--- pear-core/PEAR/PackageFile/v2.php:1.45 Fri Nov 5 00:07:12 2004
+++ pear-core/PEAR/PackageFile/v2.php Fri Nov 5 00:15:13 2004
@@ -17,7 +17,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: v2.php,v 1.45 2004/11/05 05:07:12 cellog Exp $
+// $Id: v2.php,v 1.46 2004/11/05 05:15:13 cellog Exp $
require_once 'PEAR/ErrorStack.php';
require_once 'PEAR/Validate.php';
require_once 'PEAR/PackageFile/Generator/v2.php';
@@ -1928,8 +1928,8 @@
foreach (array('required', 'optional', 'group') as
$possible) {
if ($type == $possible) {
$new[$type] = array();
- } elseif (isset($save[$type])) {
- $new[$type] = $save[$type];
+ } elseif (isset($save[$possible])) {
+ $new[$possible] = $save[$possible];
}
}
$this->_packageInfo['dependencies'] = $new;
@@ -2000,18 +2000,18 @@
foreach (array('required', 'optional', 'group') as
$possible) {
if ($type == $possible) {
$new[$type] = array();
- } elseif (isset($save[$type])) {
- $new[$type] = $save[$type];
+ } elseif (isset($save[$possible])) {
+ $new[$possible] = $save[$possible];
}
}
$this->_packageInfo['dependencies'] = $new;
}
- if (!isset($this->_packageInfo['dependencies'][$type]['package'])) {
+ if
(!isset($this->_packageInfo['dependencies'][$type]['subpackage'])) {
$this->_packageInfo['dependencies'][$type]['subpackage'] =
$this->_constructPackageDep(array(), $name, false, $uri, false,
false, false, false);
} else {
- $this->_packageInfo['dependencies'][$type]['package'] =
+ $this->_packageInfo['dependencies'][$type]['subpackage'] =
$this->_constructPackageDep($this->_packageInfo['dependencies'][$type]['subpackage'],
$name, false, $uri, false, false, false, false);
}