[zi-cvs] packages/com.zzoss.zic packages.php,1.6,1.7 packages_dependencies.php,1.5,1.6 packages_download.php,1.4,1.5 packages_process.php,1.3,1.4

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

Modified Files:
	packages.php packages_dependencies.php packages_download.php 
	packages_process.php 
Log Message:
clean up dependency query before new installation

Index: packages.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** packages.php	10 Feb 2004 12:19:25 -0000	1.6
--- packages.php	11 Feb 2004 14:41:58 -0000	1.7
***************
*** 47,50 ****
--- 47,53 ----
          // save the selection
          $zi_registry->setPackagesActions($actions);
+         
+         // clean up previous dependency queue
+         $zi_registry->unsetPackagesQueue();
  	}
  	

Index: packages_dependencies.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_dependencies.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** packages_dependencies.php	21 Jan 2004 18:16:14 -0000	1.5
--- packages_dependencies.php	11 Feb 2004 14:41:58 -0000	1.6
***************
*** 83,88 ****
      echo '</pre>';
      */
  	// save process queue
! 	$zi_registry->setPackagesQueue($queue);
  
  	if(!$zi_deps->isError() && !$zi_deps->hasPendingDeps()) {
--- 83,89 ----
      echo '</pre>';
      */
+     
  	// save process queue
! 	$zi_registry->updatePackagesQueue($queue);
  
  	if(!$zi_deps->isError() && !$zi_deps->hasPendingDeps()) {

Index: packages_download.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_download.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** packages_download.php	9 Feb 2004 18:16:10 -0000	1.4
--- packages_download.php	11 Feb 2004 14:41:58 -0000	1.5
***************
*** 31,44 ****
      ***************************************************************************/   
  	
! 	function downloadPackages($packages_selection) {
!         
!         global $zi_registry, $process;
!         
! 		$packages_resolve = $zi_registry->getPackagesResolve();
          $process = false;
-         $packages = $zi_registry->getPackages();
  		$error = false;
     
  		if(is_array($packages_selection)) {
              foreach($packages_selection as $key => $val) {
                  $name = $packages_resolve[$key];
--- 31,45 ----
      ***************************************************************************/   
  	
! 	function downloadPackages($packages_selection)
!     {    
!         global $process;
          $process = false;
  		$error = false;
     
  		if(is_array($packages_selection)) {
+             global $zi_registry;
+             $packages_resolve = $zi_registry->getPackagesResolve();
+             $packages = $zi_registry->getPackages();
+             
              foreach($packages_selection as $key => $val) {
                  $name = $packages_resolve[$key];
***************
*** 128,135 ****
  				}
  			}
! 		}
! 		$result['error'] = $error;
! 		$result['log'] = $log;
! 		return $result;
  	}
  	
--- 129,140 ----
  				}
  			}
!             $result['error'] = $error;
!             $result['log'] = $log;
! 		} else {
!             $result['error'] = true;
!             $result['log'] = 'Nothing to download';
!         }
!         
!         return $result;
  	}
  	

Index: packages_process.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_process.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** packages_process.php	9 Feb 2004 18:54:30 -0000	1.3
--- packages_process.php	11 Feb 2004 14:41:58 -0000	1.4
***************
*** 84,87 ****
--- 84,91 ----
      $zi_registry->setPlugins($plugins_install, $plugins_remove);
      */
+     // Register all packages again, because there might be
+     // new ones from download.
+     $zi_registry->registerPackages();
+     
  	// load package selection
  	$queue = $zi_registry->getPackagesQueue();



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