[zi-cvs] packages/com.zzoss.package.lib Dependency.php,1.2,1.3

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

Modified Files:
	Dependency.php 
Log Message:
after-install package manager

Index: Dependency.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.package.lib/Dependency.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** Dependency.php	9 Feb 2004 18:54:30 -0000	1.2
--- Dependency.php	12 Feb 2004 10:36:40 -0000	1.3
***************
*** 237,241 ****
              case 'pkg':
                  // If the dpendency is optional, don't bother about it
!                 if($this->dep['@']['optional'] == 'yes'){
                      return true;
                  }
--- 237,241 ----
              case 'pkg':
                  // If the dpendency is optional, don't bother about it
!                 if(isset($this->dep['@']['optional']) && $this->dep['@']['optional'] == 'yes'){
                      return true;
                  }
***************
*** 258,261 ****
--- 258,264 ----
                      $pending = array();
                      foreach($versions as $v_available => $val){
+                         if(!isset($this->dep["@"]["version"])){
+                             $this->dep["@"]["version"] = null;
+                         }
                          if(!$this->_isResolved($this->dep['@']['rel'], $this->dep["#"], $v_available, $this->dep["@"]["version"])){
                              $pending[$this->dep["#"].'-'.$v_available]['needed_by'][] = array($this->package_name => $this->dep["@"]["rel"]);
***************
*** 280,283 ****
--- 283,287 ----
      function _isResolved($dep_rel, $dep_name, $v_available, /*$is_installed,*/ $v_required = NULL)
      {
+         $is_available = false;
          // If no version has been defined, we check, if the available version
          // is in the list of needed packages
***************
*** 285,289 ****
               $is_available = true;
          }
!         $is_installed = strlen($this->packages[$this->dep["#"].'-'.$v_available]["installed"]);
          
          switch($dep_rel) {
--- 289,293 ----
               $is_available = true;
          }
!         $is_installed = isset($this->packages[$this->dep["#"].'-'.$v_available]["installed"]);
          
          switch($dep_rel) {



-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click