Changeset 678

Show
Ignore:
Timestamp:
03/16/07 01:36:03 (2 years ago)
Author:
alo
Message:

--

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • cherokee/trunk/qa/util.py

    r677 r678  
    8888     
    8989    if PHPCGI_PATH != "auto": 
    90         __php_ref = PHPCGI_PATH 
    91         if not check_php_interpreter(__php_ref): 
    92             print "%s doesn't support fcgi" 
    93         return __php_ref 
     90        if check_php_interpreter (PHPCGI_PATH): 
     91            __php_ref = PHPCGI_PATH 
     92            return __php_ref 
    9493 
    9594    for p in PHP_DIRS: 
     
    9796            php = os.path.join(p,n) 
    9897            if os.path.exists(php): 
    99                 __php_ref = php 
    100                 if not check_php_interpreter(__php_ref): 
    101                     print "%s doesn't support fcgi" 
    102                 return php 
     98                if check_php_interpreter(php): 
     99                    __php_ref = php 
     100                    return php 
    103101 
    104     print "ERROR: PHP interpreter not found
    105     __php_ref = '' 
     102    error = "Couldn't find a suitable PHP interpreter (with fastcgi support)
     103    __php_ref = error 
    106104    return __php_ref 
    107105