[zi-cvs] packages/com.zzoss.package.lib Dependency.php,1.6,1.7

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

Modified Files:
	Dependency.php 
Log Message:
- avoid duplicate 'needed by' packages

Index: Dependency.php
===================================================================
RCS file: /cvsroot/zzossinstaller/packages/com.zzoss.package.lib/Dependency.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** Dependency.php	2 Apr 2004 12:34:34 -0000	1.6
--- Dependency.php	13 Apr 2004 10:17:33 -0000	1.7
***************
*** 260,264 ****
                      }
                      $this->undefined[$pkg_undef_name]['name'] = $this->dep["#"];
!                     $this->undefined[$pkg_undef_name]['needed_by'][] = array($this->package_name => $this->dep["@"]["rel"]);
                      //print_r($this->undefined[$pkg_undef_name]['needed_by']);
                      //$this->undefined[$pkg_undef_name]['needed_by'] = array_unique($this->undefined[$pkg_undef_name]['needed_by']);
--- 260,275 ----
                      }
                      $this->undefined[$pkg_undef_name]['name'] = $this->dep["#"];
!                     /*
!                     if(isset($this->undefined[$pkg_undef_name]['needed_by'])){
!                         echo '<pre>';
!                         print_r($this->undefined[$pkg_undef_name]['needed_by']);
!                         echo '<pre>';
!                     }
!                     */
!                     if(
!                         !isset($this->undefined[$pkg_undef_name]['needed_by'][$this->package_name])
!                         ){
!                         $this->undefined[$pkg_undef_name]['needed_by'][$this->package_name] = $this->dep["@"]["rel"];
!                     }
                      //print_r($this->undefined[$pkg_undef_name]['needed_by']);
                      //$this->undefined[$pkg_undef_name]['needed_by'] = array_unique($this->undefined[$pkg_undef_name]['needed_by']);
***************
*** 275,279 ****
                          }
                          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"]);
                              //$pending[$this->dep["#"].'-'.$v_available]['needed_by'] = array_unique($pending[$this->dep["#"].'-'.$v_available]['needed_by']);
                          } else {
--- 286,295 ----
                          }
                          if(!$this->_isResolved($this->dep['@']['rel'], $this->dep["#"], $v_available, $this->dep["@"]["version"])){
!                             if(
!                                 !isset($pending[$this->dep["#"].'-'.$v_available]['needed_by'][$this->package_name])
!                                 ){
!                                 $pending[$this->dep["#"].'-'.$v_available]['needed_by'][$this->package_name] = $this->dep["@"]["rel"];
!                             }
!                             //$pending[$this->dep["#"].'-'.$v_available]['needed_by'][] = array($this->package_name => $this->dep["@"]["rel"]);
                              //$pending[$this->dep["#"].'-'.$v_available]['needed_by'] = array_unique($pending[$this->dep["#"].'-'.$v_available]['needed_by']);
                          } else {
***************
*** 288,291 ****
--- 304,314 ----
                      }
                  }
+                 /*
+                 if(isset($this->pending[$this->dep["#"].'-'.$v_available]['needed_by'][$this->package_name])){
+                     echo '<pre>';
+                     print_r($this->pending[$this->dep["#"].'-'.$v_available]['needed_by'][$this->package_name]);
+                     echo '<pre>';
+                 }
+                 */
                  break;
          }



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