[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pear-cvs
Subject:    [PEAR-CVS] cvs: pear-core /PEAR/Downloader Package.php
From:       "Helgi �ormar �orbj�rnsson" <dufuz () php ! net>
Date:       2009-01-31 21:01:11
Message-ID: cvsdufuz1233435671 () cvsserver
[Download RAW message or body]

dufuz		Sat Jan 31 21:01:11 2009 UTC

  Modified files:              
    /pear-core/PEAR/Downloader	Package.php 
  Log:
  readability
  
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/Downloader/Package.php?r1=1.117&r2=1.118&diff_format=u
                
Index: pear-core/PEAR/Downloader/Package.php
diff -u pear-core/PEAR/Downloader/Package.php:1.117 \
                pear-core/PEAR/Downloader/Package.php:1.118
--- pear-core/PEAR/Downloader/Package.php:1.117	Sat Jan 31 19:08:30 2009
+++ pear-core/PEAR/Downloader/Package.php	Sat Jan 31 21:01:11 2009
@@ -15,7 +15,7 @@
  * @author     Greg Beaver <cellog@php.net>
  * @copyright  1997-2008 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Package.php,v 1.117 2009/01/31 19:08:30 dufuz Exp $
+ * @version    CVS: $Id: Package.php,v 1.118 2009/01/31 21:01:11 dufuz Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -1789,6 +1789,7 @@
             }
         }
 
+        $preferred_state = $this->_config->get('preferred_state');
         if (!isset($info['url'])) {
             if ($this->isInstalled($info)) {
                 if ($isdependency && version_compare($info['version'],
@@ -1815,7 +1816,7 @@
                     }
 
                     if (!in_array($info['info']->getState(),
-                          \
PEAR_Common::betterStates($this->_config->get('preferred_state'), true))) { +         \
PEAR_Common::betterStates($preferred_state, true))) {  if ($optional) {
                             // don't spit out confusing error message
                             return $this->_downloader->_getPackageDownloadUrl(
@@ -1823,7 +1824,7 @@
                                       'channel' => $pname['channel'],
                                       'version' => $info['version']));
                         }
-                        $vs = ' within preferred state "' . \
$this->_config->get('preferred_state') . +                        $vs = ' within \
preferred state "' . $preferred_state .  '"';
                     } else {
                         if (!class_exists('PEAR_Dependency2')) {
@@ -1841,8 +1842,7 @@
                         $instead = '';
                     }
                 } else {
-                    $vs = ' within preferred state "' . $this->_config->get(
-                        'preferred_state') . '"';
+                    $vs = ' within preferred state "' . $preferred_state . '"';
                 }
 
                 if (!isset($options['soft'])) {
@@ -1881,7 +1881,7 @@
                         require_once 'PEAR/Common.php';
                     }
                     if (!in_array($info['info']->getState(),
-                          \
PEAR_Common::betterStates($this->_config->get('preferred_state'), true))) { +         \
PEAR_Common::betterStates($preferred_state, true))) {  if ($optional) {
                             // don't spit out confusing error message, and don't die \
on  // optional dep failure!
@@ -1890,7 +1890,7 @@
                                       'channel' => $pname['channel'],
                                       'version' => $info['version']));
                         }
-                        $vs = ' within preferred state "' . \
$this->_config->get('preferred_state') . +                        $vs = ' within \
preferred state "' . $preferred_state .  '"';
                     } else {
                         if (!class_exists('PEAR_Dependency2')) {
@@ -1907,9 +1907,9 @@
                         $vs = PEAR_Dependency2::_getExtraString($pname);
                     }
                 } else {
-                    $vs = ' within preferred state "' . \
                $this->_downloader->config->get(
-                        'preferred_state') . '"';
+                    $vs = ' within preferred state "' . \
$this->_downloader->config->get('preferred_state') . '"';  }
+
                 $options = $this->_downloader->getOptions();
                 // this is only set by the "download-all" command
                 if (isset($options['ignorepreferred_state'])) {
@@ -1926,6 +1926,7 @@
                             PEAR_DOWNLOADER_PACKAGE_STATE);
                     return $err;
                 }
+
                 $err = PEAR::raiseError(
                     'Failed to download ' . \
                $this->_registry->parsedPackageNameToString(
                         array('channel' => $pname['channel'], 'package' => \
$pname['package']), @@ -1939,6 +1940,7 @@
                 return $err;
             }
         }
+
         if (isset($info['deprecated']) && $info['deprecated']) {
             $this->_downloader->log(0,
                 'WARNING: "' .
@@ -1949,6 +1951,7 @@
                     $this->_registry->parsedPackageNameToString($info['deprecated'], \
true) .  '"');
         }
+
         return $info;
     }
 }
\ No newline at end of file



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


[prev in list] [next in list] [prev in thread] [next in thread]