[zi-cvs] packages/com.zzoss.package.lib Package.php,1.3,1.4

Update of /cvsroot/zzossinstaller/packages/com.zzoss.package.lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3059/com.zzoss.package.lib

Modified Files:
	Package.php 
Log Message:
E_ALL support

Index: Package.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.package.lib/Package.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** Package.php	29 Jan 2004 14:09:16 -0000	1.3
--- Package.php	9 Feb 2004 18:16:10 -0000	1.4
***************
*** 65,101 ****
              if($dp = @opendir($src)) {
                  while (false !== ($file = readdir($dp))) {
-                     /*
-                     $parts = pathinfo($file);
-                     if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
-                         // get the bundle name without extensions by cutting
-                         // off the extension which could be .tar.gz
-                         $bundle = str_replace(array('.'.$parts['extension'],'.tar'), '', $parts['basename']);
-                         */
                          $file = $src.$file;
                          ZZOSS_Package::extractBundle($file, $dest, $backup_dest);
-                         /*
-                         $tmp_src = $dest.'.tmp'.DIRECTORY_SEPARATOR;
-                         
-                         System::mkdir(array('-p',$tmp_src));
-                         if(ZZOSS_PACKAGE_DEBUG){
-                             ZZOSS_Debug::log('ZZOSS_Package', 'Extracting '.$file.' to '.$tmp_src, __FILE__, __LINE__, __FUNCTION__, __CLASS__);
-                         }
-                         $tar = new Archive_Tar($file);
-                         if (!@$tar->extractModify($tmp_src)) {
-                             return PEAR::raiseError("unable to unpack $file");
-                         }
-                         
-                         // Try to extract the distribution
-                         if(!ZZOSS_Package::extractDistribution($tmp_src, $dest)){
-                             if(!ZZOSS_Package::extractDistribution($tmp_src.$bundle.DIRECTORY_SEPARATOR, $dest)){
-                                 PEAR::raiseError('Cannot extract distribution from bundle "'.$bundle.'".');
-                                 return false;
-                             }
-                         }
-                         
-                         //unlink($file);
-                         System::rm(array('-rf', $tmp_src));
-                         
-                     }*/
                  }
                  closedir($dp);
--- 65,70 ----
***************
*** 118,122 ****
              $tar = new Archive_Tar($file);
              //$tar->setErrorHandling(PEAR_ERROR_PRINT);
!             if (!$tar->extractModify($tmp_src, '')) {
                  return PEAR::raiseError("unable to unpack $file");
                  if(ZZOSS_PACKAGE_DEBUG){
--- 87,91 ----
              $tar = new Archive_Tar($file);
              //$tar->setErrorHandling(PEAR_ERROR_PRINT);
!             if (!$tar->extract($tmp_src)) {
                  return PEAR::raiseError("unable to unpack $file");
                  if(ZZOSS_PACKAGE_DEBUG){
***************
*** 156,160 ****
              $tar = new Archive_Tar($file);
              //$tar->setErrorHandling(PEAR_ERROR_PRINT);
!             if (!$tar->extractModify($tmp_src, '')) {
                  return PEAR::raiseError("unable to unpack $file");
              }
--- 125,129 ----
              $tar = new Archive_Tar($file);
              //$tar->setErrorHandling(PEAR_ERROR_PRINT);
!             if (!$tar->extract($tmp_src)) {
                  return PEAR::raiseError("unable to unpack $file");
              }
***************
*** 280,284 ****
      {
          $tar = new Archive_Tar($src);
!         if (!@$tar->extractModify($dest)) {
              return PEAR::raiseError("unable to unpack $src");
          }
--- 249,253 ----
      {
          $tar = new Archive_Tar($src);
!         if (!$tar->extract($dest)) {
              return PEAR::raiseError("unable to unpack $src");
          }
***************
*** 302,306 ****
                      }
                      $tar = new Archive_Tar($pkgsrc);
!                     if (!@$tar->extractModify($dest)) {
                          return PEAR::raiseError("unable to unpack $pgksrc");
                          if(ZZOSS_PACKAGE_DEBUG){
--- 271,275 ----
                      }
                      $tar = new Archive_Tar($pkgsrc);
!                     if (!$tar->extract($dest)) {
                          return PEAR::raiseError("unable to unpack $pgksrc");
                          if(ZZOSS_PACKAGE_DEBUG){



-------------------------------------------------------
The SF.Net email is sponsored by EclipseCon 2004
Premiere Conference on Open Tools Development and Integration
See the breadth of Eclipse activity. February 3-5 in Anaheim, CA.
http://www.eclipsecon.org/osdn