cvs: pear-core /PEAR/PackageFile v2.php
| From: | Greg Beaver | Date: | Thu, 04 Nov 2004 23:19:58 +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-25684@lists.php.net to get a copy of this message | ||
cellog Thu Nov 4 18:19:58 2004 EDT
Modified files:
/pear-core/PEAR/PackageFile v2.php
Log:
fix addConflictingPackageDepWith*() multiple dependencies
http://cvs.php.net/diff.php/pear-core/PEAR/PackageFile/v2.php?r1=1.42&r2=1.43&ty=u
Index: pear-core/PEAR/PackageFile/v2.php
diff -u pear-core/PEAR/PackageFile/v2.php:1.42 pear-core/PEAR/PackageFile/v2.php:1.43
--- pear-core/PEAR/PackageFile/v2.php:1.42 Thu Nov 4 18:05:05 2004
+++ pear-core/PEAR/PackageFile/v2.php Thu Nov 4 18:19:57 2004
@@ -17,7 +17,7 @@
// | |
// +----------------------------------------------------------------------+
//
-// $Id: v2.php,v 1.42 2004/11/04 23:05:05 cellog Exp $
+// $Id: v2.php,v 1.43 2004/11/04 23:19:57 cellog Exp $
require_once 'PEAR/ErrorStack.php';
require_once 'PEAR/Validate.php';
require_once 'PEAR/PackageFile/Generator/v2.php';
@@ -1665,6 +1665,10 @@
if
(!isset($this->_packageInfo['dependencies']['required']['package']))
{
$this->_packageInfo['dependencies']['required']['package'] = $dep;
} else {
+ if
(!isset($this->_packageInfo['dependencies']['required']['package'][0]))
{
+
$this->_packageInfo['dependencies']['required']['package'] = array(
+
$this->_packageInfo['dependencies']['required']['package']);
+ }
$this->_packageInfo['dependencies']['required']['package'][] =
$dep;
}
}
@@ -1695,6 +1699,10 @@
if
(!isset($this->_packageInfo['dependencies']['required']['package']))
{
$this->_packageInfo['dependencies']['required']['package'] = $dep;
} else {
+ if
(!isset($this->_packageInfo['dependencies']['required']['package'][0]))
{
+
$this->_packageInfo['dependencies']['required']['package'] = array(
+
$this->_packageInfo['dependencies']['required']['package']);
+ }
$this->_packageInfo['dependencies']['required']['package'][] =
$dep;
}
}
@@ -1788,6 +1796,10 @@
if (!isset($this->_packageInfo['dependencies'][$type]['package'])) {
$this->_packageInfo['dependencies'][$type]['package'] = $dep;
} else {
+ if
(!isset($this->_packageInfo['dependencies']['required']['package'][0]))
{
+ $this->_packageInfo['dependencies'][$type]['package'] =
array(
+ $this->_packageInfo['dependencies'][$type]['package']);
+ }
$this->_packageInfo['dependencies'][$type]['package'][] = $dep;
}
}
@@ -1849,6 +1861,10 @@
if
(!isset($this->_packageInfo['dependencies'][$type]['subpackage'])) {
$this->_packageInfo['dependencies'][$type]['subpackage'] = $dep;
} else {
+ if
(!isset($this->_packageInfo['dependencies'][$type]['subpackage'][0])) {
+ $this->_packageInfo['dependencies'][$type]['subpackage'] =
array(
+
$this->_packageInfo['dependencies'][$type]['subpackage']);
+ }
$this->_packageInfo['dependencies'][$type]['subpackage'][] =
$dep;
}
}
@@ -1877,6 +1893,10 @@
if
(!isset($this->_packageInfo['dependencies'][$type]['subpackage'])) {
$this->_packageInfo['dependencies'][$type]['subpackage'] = $dep;
} else {
+ if
(!isset($this->_packageInfo['dependencies'][$type]['subpackage'][0])) {
+ $this->_packageInfo['dependencies'][$type]['subpackage'] =
array(
+
$this->_packageInfo['dependencies'][$type]['subpackage']);
+ }
$this->_packageInfo['dependencies'][$type]['subpackage'][] =
$dep;
}
}