[zi-cvs] packages/com.zzoss.installer.lib Registry.php,1.10,1.11

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

Modified Files:
	Registry.php 
Log Message:
clean up dependency query before new installation

Index: Registry.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.installer.lib/Registry.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -C2 -d -r1.10 -r1.11
*** Registry.php	9 Feb 2004 18:16:10 -0000	1.10
--- Registry.php	11 Feb 2004 14:41:58 -0000	1.11
***************
*** 50,53 ****
--- 50,54 ----
      var $has_applications       = false;
      var $no_application         = true;
+     var $application_path;
      
      function ZZOSS_InstallerRegistry($dir = NULL)
***************
*** 1121,1132 ****
          $count = 0;
          $package_sources = array();
!         /*
!         $application_settings = $this->getApplicationSettings();
!         if(is_array($application_settings["additional_sources"]) &&
!             count($application_settings["additional_sources"]) ) {
!                 $package_sources = $application_settings["additional_sources"];
!         }
!         */
!         $package_sources[] =$this->application_path.'packages'.DIRECTORY_SEPARATOR;
          
          foreach($package_sources as $sourcedir) {
--- 1122,1126 ----
          $count = 0;
          $package_sources = array();
!         $package_sources[] = $this->application_path.'packages'.DIRECTORY_SEPARATOR;
          
          foreach($package_sources as $sourcedir) {
***************
*** 1249,1253 ****
                          $xml = $package_config->query('/package');
                          if(!isset($package[$xml["name"].'-'.$xml['release']['version']])) {
!                             $key = $key = $xml["name"].'-'.$xml['release']['version'];
                              $package[$key] = $xml;
                              $packages_resolve[$count] = $key;
--- 1243,1247 ----
                          $xml = $package_config->query('/package');
                          if(!isset($package[$xml["name"].'-'.$xml['release']['version']])) {
!                             $key = $xml["name"].'-'.$xml['release']['version'];
                              $package[$key] = $xml;
                              $packages_resolve[$count] = $key;
***************
*** 1404,1409 ****
          }
      }
      
!     function setPackagesQueue($queue_new)
  	{
  		// save process queue
--- 1398,1410 ----
          }
      }
+ 
+     function unsetPackagesQueue()
+ 	{
+ 		// save process queue
+ 		$file = $this->application_path.'installer'.DIRECTORY_SEPARATOR.'installation_packages_queue.reg';
+         return @unlink($file);
+ 	}
      
!     function updatePackagesQueue($queue_new)
  	{
  		// save process queue



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