Magellan Linux

Diff of /trunk/mage/usr/lib/mage/depwalker.sh

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1560 by niro, Wed Dec 28 09:55:37 2011 UTC revision 1564 by niro, Wed Dec 28 10:05:49 2011 UTC
# Line 98  checklist_processeddeps() Line 98  checklist_processeddeps()
98  }  }
99    
100  #####################  #####################
101  ##  rumwandern /path/to/mage/file/.mage  ##  depwalking /path/to/mage/file/.mage
102  rumwandern()  depwalking()
103  {  {
104   unset DEPEND   unset DEPEND
105   unset SDEPEND   unset SDEPEND
# Line 185  rumwandern() Line 185  rumwandern()
185   PVER="$(magename2pver ${HIGHEST_DEPFILE})"   PVER="$(magename2pver ${HIGHEST_DEPFILE})"
186   PBUILD="$(magename2pbuild ${HIGHEST_DEPFILE})"   PBUILD="$(magename2pbuild ${HIGHEST_DEPFILE})"
187    
188   ## check ob schon in ALLDEPS enthalten dann mach weiter   ## dep already in ALLDEPS? then going on
189    
190   # usage of fgrep is extremly slow and consumes a lot of cpu power   # usage of fgrep is extremly slow and consumes a lot of cpu power
191   #if [ -z "$(echo ${ALLDEPS} | fgrep "${HIGHEST_DEPFILE}")" ]   #if [ -z "$(echo ${ALLDEPS} | fgrep "${HIGHEST_DEPFILE}")" ]
192   if checklist_alldeps "${HIGHEST_DEPFILE}"   if checklist_alldeps "${HIGHEST_DEPFILE}"
193   then   then
194   ### check ob DFILE schon installiert ist ###   ### check if the dependency is already installed ###
195   if [ ! -d ${MROOT}${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ]   if [ ! -d ${MROOT}${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ]
196   then   then
197   rumwandern ${HIGHEST_DEPFILE}   depwalking ${HIGHEST_DEPFILE}
198   ALLDEPS="${ALLDEPS} ${HIGHEST_DEPFILE}"   ALLDEPS="${ALLDEPS} ${HIGHEST_DEPFILE}"
199   fi   fi
200   fi   fi
# Line 204  EOF Line 204  EOF
204   return 0   return 0
205  }  }
206    
   
 ### abort if this package is already installed (retval 3)  
 # maybe later ?  
 #[ -d ${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ] && exit 3  
   
207  [[ ${METHOD} = pretend ]] || \  [[ ${METHOD} = pretend ]] || \
208   [[ ${METHOD} = srcpretend ]] || \   [[ ${METHOD} = srcpretend ]] || \
209   [[ ${METHOD} = uppretend ]] || \   [[ ${METHOD} = uppretend ]] || \
# Line 242  then Line 237  then
237   PVER="$(magename2pver ${MAGEFILE})"   PVER="$(magename2pver ${MAGEFILE})"
238   PBUILD="$(magename2pbuild ${MAGEFILE})"   PBUILD="$(magename2pbuild ${MAGEFILE})"
239    
240   # do not wander files which are installed   # do not walk files which are installed
241   if [ ! -d ${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ]   if [ ! -d ${INSTALLDB}/${PCAT}/${PNAME}-${PVER}-${PBUILD} ]
242   then   then
243   # get dependencies the package   # get dependencies the package
244   rumwandern ${MAGEFILE}   depwalking ${MAGEFILE}
245    
246   # now add the package itself to the dependencies   # now add the package itself to the dependencies
247   # (if not exists already)   # (if not exists already)
# Line 258  then Line 253  then
253   fi   fi
254   done   done
255  else  else
256   # get dependencies the package   # get all dependencies of the package
257   rumwandern ${MAGEFILE}   depwalking ${MAGEFILE}
258    
259   # now add the package itself to the dependencies   # now add the package itself to the dependencies
260   ALLDEPS="${ALLDEPS} ${MAGEFILE}"   ALLDEPS="${ALLDEPS} ${MAGEFILE}"
# Line 325  fi Line 320  fi
320   [[ ${METHOD} = upgrade ]] || \   [[ ${METHOD} = upgrade ]] || \
321   [[ ${METHOD} = srcupgrade ]] && \   [[ ${METHOD} = srcupgrade ]] && \
322   echo "${ALLDEPS}"   echo "${ALLDEPS}"
   
 # delete ${BUILDDIR}/virtuals if exists as not needed anymore  
 #[ -d ${BUILDDIR}/virtuals ] && rm -rf ${BUILDDIR}/virtuals  

Legend:
Removed from v.1560  
changed lines
  Added in v.1564