[zi-cvs] packages/com.zzoss.installer.lib Registry.php,1.14,1.15

[email protected] Mon, 08 Mar 2004 22:06:17 -0800
Newsgroups gmane.comp.php.zzoss.installer.cvs
Message-ID <[email protected]>
Update of /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27040/com.zzoss.installer.lib

Modified Files:
	Registry.php 
Log Message:
also refresh packages when freshly installed

Index: Registry.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib/Registry.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Registry.php	8 Mar 2004 10:18:24 -0000	1.14
--- Registry.php	9 Mar 2004 06:06:15 -0000	1.15
***************
*** 940,954 ****
          
          $src_pkgs = $this->application_path.$src.DIRECTORY_SEPARATOR;
          
          // Refresh package registry only if something changed in source since
          // we last registerd the packages
          if($this->isRegPackages()){
              if(!
!                 (filemtime($src_pkgs.'.') > $this->getPackagesMtime())
                  ){
                  return true;
!             }
          }
!         
          if(ZZOSS_INSTALLER_REGISTRY_DEBUG){
              ZZOSS_Debug::log('ZZOSS_Registry', 'Start registering packages.', __FILE__, __LINE__, __FUNCTION__, __CLASS__);
--- 940,957 ----
          
          $src_pkgs = $this->application_path.$src.DIRECTORY_SEPARATOR;
+         $installed_pkgs = $this->application_path.$this->package_type.'s_installed'.DIRECTORY_SEPARATOR;
          
          // Refresh package registry only if something changed in source since
          // we last registerd the packages
          if($this->isRegPackages()){
+             $mtime_pkgs = $this->getPackagesMtime();
              if(!
!                 (filemtime($src_pkgs.'.') > $mtime_pkgs) &&
!                 (is_dir($installed_pkgs) && filemtime($installed_pkgs) > $mtime_pkgs)
                  ){
                  return true;
!                 }
          }
!                 
          if(ZZOSS_INSTALLER_REGISTRY_DEBUG){
              ZZOSS_Debug::log('ZZOSS_Registry', 'Start registering packages.', __FILE__, __LINE__, __FUNCTION__, __CLASS__);
***************
*** 1387,1391 ****
      function unsetPackages()
      {
!         $packages_reg = $this->application_path.'installer'.DIRECTORY_SEPARATOR.$this->package_type.'s_packages.reg';
          if(file_exists($packages_reg)){
              unlink($packages_reg);
--- 1390,1394 ----
      function unsetPackages()
      {
!         echo $packages_reg = $this->application_path.'installer'.DIRECTORY_SEPARATOR.$this->package_type.'s_packages.reg';
          if(file_exists($packages_reg)){
              unlink($packages_reg);



-------------------------------------------------------
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