diff options
| author | Greg Beaver <cellog@php.net> | 2004-06-12 06:15:55 +0000 |
|---|---|---|
| committer | Greg Beaver <cellog@php.net> | 2004-06-12 06:15:55 +0000 |
| commit | 22fa023c8856371bcc7c9fae791fc44175f84d2c (patch) | |
| tree | d0f3af07908d20c1e31ebe3be2048729fc5d7a17 /pear | |
| parent | 9873fa5e42c30f8c8d2fcd9c1ea00427d6c78a74 (diff) | |
| download | php-git-22fa023c8856371bcc7c9fae791fc44175f84d2c.tar.gz | |
fix bug #1610: pear package doesn't validate deps
It was never validating deps at all!
Diffstat (limited to 'pear')
| -rw-r--r-- | pear/PEAR/Common.php | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/pear/PEAR/Common.php b/pear/PEAR/Common.php index 1ee82e2844..2f9c611823 100644 --- a/pear/PEAR/Common.php +++ b/pear/PEAR/Common.php @@ -1115,24 +1115,24 @@ class PEAR_Common extends PEAR $i++; } } - if (!empty($info['deps'])) { + if (!empty($info['release_deps'])) { $i = 1; - foreach ($info['deps'] as $d) { + foreach ($info['release_deps'] as $d) { if (empty($d['type'])) { $errors[] = "dependency $i: missing type"; } elseif (!in_array($d['type'], PEAR_Common::getDependencyTypes())) { - $errors[] = "dependency $i: invalid type, should be one of: " . + $errors[] = "dependency $i: invalid type '$d[type]', should be one of: " . implode(' ', PEAR_Common::getDependencyTypes()); } if (empty($d['rel'])) { $errors[] = "dependency $i: missing relation"; } elseif (!in_array($d['rel'], PEAR_Common::getDependencyRelations())) { - $errors[] = "dependency $i: invalid relation, should be one of: " + $errors[] = "dependency $i: invalid relation '$d[rel]', should be one of: " . implode(' ', PEAR_Common::getDependencyRelations()); } if (!empty($d['optional'])) { if (!in_array($d['optional'], array('yes', 'no'))) { - $errors[] = "dependency $i: invalid relation optional attribute, should be one of: yes no"; + $errors[] = "dependency $i: invalid relation optional attribute '$d[optional]', should be one of: yes no"; } } if ($d['rel'] != 'has' && empty($d['version'])) { |