[zi-cvs] packages/com.zzoss.package.lib Package.php,1.2,1.3
[email protected] Thu, 29 Jan 2004 06:09:18 -0800
| Newsgroups | gmane.comp.php.zzoss.installer.cvs |
|---|---|
| Message-ID | <[email protected]> |
Update of /cvsroot/zzossinstaller/packages/com.zzoss.package.lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16467/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.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Package.php 4 Jan 2004 13:26:55 -0000 1.2
--- Package.php 29 Jan 2004 14:09:16 -0000 1.3
***************
*** 117,123 ****
}
$tar = new Archive_Tar($file);
! $tar->setErrorHandling(PEAR_ERROR_PRINT);
if (!$tar->extractModify($tmp_src, '')) {
return PEAR::raiseError("unable to unpack $file");
}
--- 117,126 ----
}
$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){
+ ZZOSS_Debug::log("unable to unpack $file", __FILE__, __LINE__, __FUNCTION__, __CLASS__);
+ }
}
***************
*** 134,139 ****
if(!is_null($backup_dest)){
- /*unlink($file);
- } else {*/
copy($file, $backup_dest.basename($file));
}
--- 137,140 ----
***************
*** 154,158 ****
}
$tar = new Archive_Tar($file);
! $tar->setErrorHandling(PEAR_ERROR_PRINT);
if (!$tar->extractModify($tmp_src, '')) {
return PEAR::raiseError("unable to unpack $file");
--- 155,159 ----
}
$tar = new Archive_Tar($file);
! //$tar->setErrorHandling(PEAR_ERROR_PRINT);
if (!$tar->extractModify($tmp_src, '')) {
return PEAR::raiseError("unable to unpack $file");
***************
*** 185,188 ****
--- 186,190 ----
ZZOSS_Debug::log('ZZOSS_Package', 'Does not exist: '.$distribution_xml_src, __FILE__, __LINE__, __FUNCTION__, __CLASS__);
}
+ PEAR::raiseError('Distribution XML is not included');
return false;
}
***************
*** 205,209 ****
copy($distribution_xml_src, $distribution_dir.'distribution.xml');
// finally set "rebuild distributions" flag
! $fp = fopen($dest."installer/distributions.lock","w");
fputs($fp,'dummy');
fclose($fp);
--- 207,211 ----
copy($distribution_xml_src, $distribution_dir.'distribution.xml');
// finally set "rebuild distributions" flag
! $fp = fopen($dest."installer".DIRECTORY_SEPARATOR."distributions.lock","w");
fputs($fp,'dummy');
fclose($fp);
***************
*** 237,241 ****
$application_config->setFile($application_xml_src);
$application = $application_config->query('/application');
! $application_dir = $dest.'applications/'.$application["name"].'-'.$application["release"]["version"].DIRECTORY_SEPARATOR;
System::mkdir(array('-p',$application_dir));
@copy($application_xml_src, $application_dir.'application.xml');
--- 239,243 ----
$application_config->setFile($application_xml_src);
$application = $application_config->query('/application');
! $application_dir = $dest.'applications'.DIRECTORY_SEPARATOR.$application["name"].'-'.$application["release"]["version"].DIRECTORY_SEPARATOR;
System::mkdir(array('-p',$application_dir));
@copy($application_xml_src, $application_dir.'application.xml');
***************
*** 247,251 ****
System::mkdir(array('-p',$application_dir.'plugins'));
! @copy($packages_xml_src, $application_dir.'installer'.DIRECTORY_SEPARATOR.'remote_packages.xml');
// try to copy tgz files
--- 249,255 ----
System::mkdir(array('-p',$application_dir.'plugins'));
! if(file_exists($packages_xml_src)){
! copy($packages_xml_src, $application_dir.'installer'.DIRECTORY_SEPARATOR.'remote_packages.xml');
! }
// try to copy tgz files
***************
*** 255,259 ****
if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
$package_src = $src.$file2;
! $package_dest = $application_dir.'downloads/'.$file2;
if(ZZOSS_PACKAGE_DEBUG){
ZZOSS_Debug::log('ZZOSS_Package', 'Copying '.$package_src.' to '.$package_dest, __FILE__, __LINE__, __FUNCTION__, __CLASS__);
--- 259,263 ----
if($parts["extension"] == 'tgz' || $parts["extension"]=='gz') {
$package_src = $src.$file2;
! $package_dest = $application_dir.'downloads'.DIRECTORY_SEPARATOR.$file2;
if(ZZOSS_PACKAGE_DEBUG){
ZZOSS_Debug::log('ZZOSS_Package', 'Copying '.$package_src.' to '.$package_dest, __FILE__, __LINE__, __FUNCTION__, __CLASS__);
***************
*** 266,270 ****
// finally set "rebuild application" flag
! $fp = fopen($dest."installer/applications.lock","w");
fputs($fp,'dummy');
fclose($fp);
--- 270,274 ----
// finally set "rebuild application" flag
! $fp = fopen($dest."installer".DIRECTORY_SEPARATOR."applications.lock","w");
fputs($fp,'dummy');
fclose($fp);
***************
*** 316,320 ****
$package_config->setFile($package_xml_src);
$package = $package_config->query('/package');
! $package_xml_dest = $dest.$package["name"].'-'.$package["release"]["version"].'/package.xml';
@copy($package_xml_src, $package_xml_dest);
if(ZZOSS_PACKAGE_DEBUG){
--- 320,324 ----
$package_config->setFile($package_xml_src);
$package = $package_config->query('/package');
! $package_xml_dest = $dest.$package["name"].'-'.$package["release"]["version"].DIRECTORY_SEPARATOR.'package.xml';
@copy($package_xml_src, $package_xml_dest);
if(ZZOSS_PACKAGE_DEBUG){
***************
*** 425,429 ****
chdir($package_src);
$tar = new Archive_Tar($package_dest.$package_tgz);
! $tar->setErrorHandling(PEAR_ERROR_PRINT);
$tar->createModify($package_xml_new, '', $pkg_tmpdir);
//$tar->create('package.xml');
--- 429,433 ----
chdir($package_src);
$tar = new Archive_Tar($package_dest.$package_tgz);
! //$tar->setErrorHandling(PEAR_ERROR_PRINT);
$tar->createModify($package_xml_new, '', $pkg_tmpdir);
//$tar->create('package.xml');
-------------------------------------------------------
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