[zi-cvs] packages/com.zzoss.package.lib Package.php,1.11,1.12

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

Modified Files:
	Package.php 
Log Message:
make update work

Index: Package.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.package.lib/Package.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** Package.php	5 Apr 2004 06:18:32 -0000	1.11
--- Package.php	5 Apr 2004 09:58:16 -0000	1.12
***************
*** 219,250 ****
      }
      
!     function tmpBundle($file)
      {
!         $parts = pathinfo($file);
          if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
-             $dest = System::mktemp(array('-d'));
-             $tmp_src = $dest.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);
!             //$tar->setErrorHandling(PEAR_ERROR_PRINT);
!             if (!$tar->extract($tmp_src)) {
!                 return PEAR::raiseError("unable to unpack $file");
              }
              
              // Get distribution and application XML data.
!             $file = $tmp_src.'application.xml';
              $config = new ZZOSS_Config;
!             $config->setFile($file);
              $descriptions['application'] = $config->query('/application');
              
!             $file = $tmp_src.'distribution.xml';
              $config = new ZZOSS_Config;
!             $config->setFile($file);
              $descriptions['distribution'] = $config->query('/distribution');
-             $descriptions['src'] = $tmp_src;
              
              return $descriptions;
--- 219,252 ----
      }
      
!     function getBundleDescr($bundle_tgz, $extract_dir)
      {
!         $parts = pathinfo($bundle_tgz);
          if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
              
!             $extract_dir = $extract_dir.DIRECTORY_SEPARATOR;
!             if(!is_dir($extract_dir)){
!                 return PEAR::raiseError("Is not a directory: '$extract_dir'.");
!             }
!             
!             System::mkdir(array('-p',$extract_dir));
              if(ZZOSS_PACKAGE_DEBUG){
!                 ZZOSS_Debug::log('ZZOSS_Package', 'Extracting '.$bundle_tgz.' to '.$extract_dir, __FILE__, __LINE__, __FUNCTION__, __CLASS__);
              }
!             $tar = new Archive_Tar($bundle_tgz);
!             $tar->setErrorHandling(PEAR_ERROR_PRINT);
!             if (!$tar->extract($extract_dir)) {
!                 return PEAR::raiseError("unable to unpack $bundle_tgz");
              }
              
              // Get distribution and application XML data.
!             $app_xml = $extract_dir.'application.xml';
              $config = new ZZOSS_Config;
!             $config->setFile($app_xml);
              $descriptions['application'] = $config->query('/application');
              
!             $distri_xml = $extract_dir.'distribution.xml';
              $config = new ZZOSS_Config;
!             $config->setFile($distri_xml);
              $descriptions['distribution'] = $config->query('/distribution');
              
              return $descriptions;



-------------------------------------------------------
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470&alloc_id=3638&op=click