[zi-cvs] packages/com.zzoss.zic packages_reset.php,1.6,1.7

Sandro Zic <[email protected]> Fri, 26 Mar 2004 08:49:21 +0000
Newsgroups gmane.comp.php.zzoss.installer.cvs
Message-ID <[email protected]>
Update of /cvsroot/zzossinstaller/packages/com.zzoss.zic
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3795

Modified Files:
	packages_reset.php 
Log Message:
fixed bug that installed pkgs did not get removed when doing a package reset in the plugins/packages manager

Index: packages_reset.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.zic/packages_reset.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** packages_reset.php	22 Mar 2004 08:25:26 -0000	1.6
--- packages_reset.php	26 Mar 2004 08:49:19 -0000	1.7
***************
*** 68,72 ****
              $zi_registry->setProcedure('plugins_fileroles');
          }
!         $remove_installed_pkgs = false;
          if($zi_registry->getProcedure($pkg_type.'s_register') == 'hide'){
              $buffer_output = true;
--- 68,74 ----
              $zi_registry->setProcedure('plugins_fileroles');
          }
!         if($zi_registry->getProcedure($pkg_type.'s_register') != 'rm_installed'){
!             $remove_installed_pkgs = false;
!         }
          if($zi_registry->getProcedure($pkg_type.'s_register') == 'hide'){
              $buffer_output = true;
***************
*** 149,154 ****
          }
          
-         $zi_registry->registerPackages('downloads');
-         
          ?>
          <h2>Installed <?php echo ucfirst($pkg_type); ?>s</h2>
--- 151,154 ----
***************
*** 177,182 ****
                  ?></textarea>
                  <?php
              }
!                         // If the package is not available locally, download it from the
              // location specified in the packages.xml.
              if($pkg_obj->hasUnprocessedPkgs()){
--- 177,184 ----
                  ?></textarea>
                  <?php
+                 $zi_registry->registerPackages('downloads');
              }
!             
!             // If the package is not available locally, download it from the
              // location specified in the packages.xml.
              if($pkg_obj->hasUnprocessedPkgs()){



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