cvs: pear-core /PEAR/Command Install.php

cellog          Sun Jan 16 22:32:44 2005 EDT

  Modified files:              
    /pear-core/PEAR/Command     Install.php 
  Log:
  fix binary package install
  
http://cvs.php.net/diff.php/pear-core/PEAR/Command/Install.php?r1=1.77&r2=1.78&ty=u
Index: pear-core/PEAR/Command/Install.php
diff -u pear-core/PEAR/Command/Install.php:1.77 
pear-core/PEAR/Command/Install.php:1.78
--- pear-core/PEAR/Command/Install.php:1.77     Sun Jan  2 02:38:30 2005
+++ pear-core/PEAR/Command/Install.php  Sun Jan 16 22:32:44 2005
@@ -16,7 +16,7 @@
 // | Author: Stig S?ther Bakken <ssb@xxxxxxx>                             |
 // +----------------------------------------------------------------------+
 //
-// $Id: Install.php,v 1.77 2005/01/02 07:38:30 cellog Exp $
+// $Id: Install.php,v 1.78 2005/01/17 03:32:44 cellog Exp $
 
 require_once "PEAR/Command/Common.php";
 require_once "PEAR/Installer.php";
@@ -385,10 +385,11 @@
             PEAR::staticPopErrorHandling();
             if (PEAR::isError($info)) {
                 $pkg = &$param->getPackageFile();
-                if ($info->getCode() != PEAR_INSTALLER_NOBINARY &&
-                      !$pkg->installBinary($this->installer)) {
-                    $this->ui->outputData('ERROR: ' .$info->getMessage());
-                    continue;
+                if ($info->getCode() != PEAR_INSTALLER_NOBINARY) {
+                    if (!($info = $pkg->installBinary($this->installer))) {
+                        $this->ui->outputData('ERROR: ' .$info->getMessage());
+                        continue;
+                    }
                 }
             }
             if (is_array($info)) {

-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php