From 8161b2f7423a142789318d76c14ad522d20fa034 Mon Sep 17 00:00:00 2001
From: Greg Beaver <cellog@php.net>
Date: Sat, 6 Dec 2003 23:45:36 +0000
Subject: [PATCH] MFB

---
 pear/PEAR/Dependency.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/pear/PEAR/Dependency.php b/pear/PEAR/Dependency.php
index 5a43ce7a26..985f0e2a2d 100644
--- a/pear/PEAR/Dependency.php
+++ b/pear/PEAR/Dependency.php
@@ -314,11 +314,19 @@ class PEAR_Dependency
      */
     function checkPHP(&$errmsg, $req, $relation = 'ge')
     {
+        // this would be a bit stupid, but oh well :)
+        if ($relation == 'has') {
+            return false;
+        }
+        if ($relation == 'not') {
+            $errmsg = "Invalid dependency - 'not' is allowed when specifying PHP, you must run PHP in PHP";
+            return PEAR_DEPENDENCY_BAD_DEPENDENCY;
+        }
         if (substr($req, 0, 2) == 'v.') {
             $req = substr($req,2, strlen($req) - 2);
         }
         $php_ver = phpversion();
-        $operator = substr($relation,0,2);
+        $operator = $relation;
         if (!version_compare("$php_ver", "$req", $operator)) {
             $errmsg = "PHP version " . $this->signOperator($operator) .
                 " $req is required";
@@ -341,9 +349,8 @@ class PEAR_Dependency
     function checkProgram(&$errmsg, $program)
     {
         // XXX FIXME honor safe mode
-        $path_delim = OS_WINDOWS ? ';' : ':';
         $exe_suffix = OS_WINDOWS ? '.exe' : '';
-        $path_elements = explode($path_delim, getenv('PATH'));
+        $path_elements = explode(PATH_SEPARATOR, getenv('PATH'));
         foreach ($path_elements as $dir) {
             $file = $dir . DIRECTORY_SEPARATOR . $program . $exe_suffix;
             if (@file_exists($file) && @is_executable($file)) {
-- 
2.40.0