cvs: pear-core / make-gopear-phar.php /PEAR Start.php /PEAR/Command Install.php /PEAR/PackageFile v2.php

cellog          Tue May 29 19:48:00 2007 UTC

  Modified files:              
    /pear-core  make-gopear-phar.php 
    /pear-core/PEAR     Start.php 
    /pear-core/PEAR/Command     Install.php 
    /pear-core/PEAR/PackageFile v2.php 
  Log:
  fix notices in phars (Bug #11142)
  add missing config variables to go-pear
  add Structures_Graph to core packages in PEAR/Start.php
  
http://cvs.php.net/viewvc.cgi/pear-core/make-gopear-phar.php?r1=1.16&r2=1.17&diff_format=u
Index: pear-core/make-gopear-phar.php
diff -u pear-core/make-gopear-phar.php:1.16 pear-core/make-gopear-phar.php:1.17
--- pear-core/make-gopear-phar.php:1.16 Sat May 19 23:52:34 2007
+++ pear-core/make-gopear-phar.php      Tue May 29 19:48:00 2007
@@ -31,7 +31,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  2005-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: make-gopear-phar.php,v 1.16 2007/05/19 23:52:34 
cellog Exp $
+ * @version    CVS: $Id: make-gopear-phar.php,v 1.17 2007/05/29 19:48:00 
cellog Exp $
  */
 
 $peardir = dirname(__FILE__);
@@ -76,7 +76,7 @@
 $pearver = $pf->getVersion();
 
 $creator = new PHP_Archive_Creator('index.php', 'go-pear.phar', false);
-$creator->useDefaultFrontController();
+//$creator->useDefaultFrontController();
 foreach ($packages as $package) {
     echo "adding PEAR/go-pear-tarballs/$package\n";
     $creator->addFile("PEAR/go-pear-tarballs/$package", 
"PEAR/go-pear-tarballs/$package");
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/Start.php?r1=1.9&r2=1.10&diff_format=u
Index: pear-core/PEAR/Start.php
diff -u pear-core/PEAR/Start.php:1.9 pear-core/PEAR/Start.php:1.10
--- pear-core/PEAR/Start.php:1.9        Sat Sep  2 20:51:15 2006
+++ pear-core/PEAR/Start.php    Tue May 29 19:48:00 2007
@@ -14,6 +14,7 @@
             'Archive_Tar',
             'Console_Getopt',
             'PEAR',
+            'Structures_Graph',
         );
     var $local_dir = array();
     var $origpwd;
@@ -31,6 +32,8 @@
     var $pear_conf;
     var $validPHPBin = false;
     var $test_dir;
+    var $download_dir;
+    var $temp_dir;
     var $config =
         array(
             'prefix',
@@ -39,6 +42,8 @@
             'doc_dir',
             'data_dir',
             'test_dir',
+            'temp_dir',
+            'download_dir',
             'pear_conf',
         );
     var $prefix;
@@ -46,6 +51,8 @@
     var $configPrompt =
         array(
             'prefix' => 'Installation base ($prefix)',
+            'temp_dir' => 'Temporary directory for processing',
+            'download_dir' => 'Temporary directory for downloads',
             'bin_dir' => 'Binaries directory',
             'php_dir' => 'PHP code directory ($php_dir)',
             'doc_dir' => 'Documentation directory',
@@ -76,6 +83,8 @@
 
             $this->localInstall = false;
             $this->bin_dir   = '$prefix';
+            $this->temp_dir   = '$prefix\tmp';
+            $this->download_dir   = '$prefix\tmp';
             $this->php_dir   = '$prefix\pear';
             $this->doc_dir   = '$php_dir\docs';
             $this->data_dir  = '$php_dir\data';
@@ -126,6 +135,8 @@
             }
             $this->bin_dir   = '$prefix/bin';
             $this->php_dir   = '$prefix/share/pear';
+            $this->temp_dir  = '/tmp/pear/install';
+            $this->download_dir  = '/tmp/pear/install';
             $this->doc_dir   = '$php_dir/docs';
             $this->data_dir  = '$php_dir/data';
             $this->test_dir  = '$php_dir/tests';
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/Command/Install.php?r1=1.130&r2=1.131&diff_format=u
Index: pear-core/PEAR/Command/Install.php
diff -u pear-core/PEAR/Command/Install.php:1.130 
pear-core/PEAR/Command/Install.php:1.131
--- pear-core/PEAR/Command/Install.php:1.130    Sat May 19 23:51:30 2007
+++ pear-core/PEAR/Command/Install.php  Tue May 29 19:48:00 2007
@@ -16,7 +16,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: Install.php,v 1.130 2007/05/19 23:51:30 cellog Exp $
+ * @version    CVS: $Id: Install.php,v 1.131 2007/05/29 19:48:00 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 0.1
  */
@@ -627,6 +627,7 @@
         }
         $errors = $this->downloader->getErrorMsgs();
         if (count($errors)) {
+            $err = array();
             $err['data'] = array();
             foreach ($errors as $error) {
                 $err['data'][] = array($error);
http://cvs.php.net/viewvc.cgi/pear-core/PEAR/PackageFile/v2.php?r1=1.137&r2=1.138&diff_format=u
Index: pear-core/PEAR/PackageFile/v2.php
diff -u pear-core/PEAR/PackageFile/v2.php:1.137 
pear-core/PEAR/PackageFile/v2.php:1.138
--- pear-core/PEAR/PackageFile/v2.php:1.137     Fri May 25 19:38:06 2007
+++ pear-core/PEAR/PackageFile/v2.php   Tue May 29 19:48:00 2007
@@ -15,7 +15,7 @@
  * @author     Greg Beaver <cellog@xxxxxxx>
  * @copyright  1997-2006 The PHP Group
  * @license    http://www.php.net/license/3_0.txt  PHP License 3.0
- * @version    CVS: $Id: v2.php,v 1.137 2007/05/25 19:38:06 cellog Exp $
+ * @version    CVS: $Id: v2.php,v 1.138 2007/05/29 19:48:00 cellog Exp $
  * @link       http://pear.php.net/package/PEAR
  * @since      File available since Release 1.4.0a1
  */
@@ -473,6 +473,9 @@
      */
     function setRawState($state)
     {
+        if (!isset($this->_packageInfo['stability'])) {
+            $this->_packageInfo['stability'] = array();
+        }
         $this->_packageInfo['stability']['release'] = $state;
     }