Magellan Linux

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

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

revision 2195 by niro, Thu Oct 10 11:05:34 2013 UTC revision 2210 by niro, Mon Oct 14 13:13:46 2013 UTC
# Line 33  usage() Line 33  usage()
33   echo "  -b     --pbuild        build number of the package"   echo "  -b     --pbuild        build number of the package"
34   echo "  -m     --method        which calc method should be used:"   echo "  -m     --method        which calc method should be used:"
35   echo "                         install, srcinstall, depend, srcdepend"   echo "                         install, srcinstall, depend, srcdepend"
36   echo "                         upgrade, srcupgrade"   echo "                         upgrade, srcupgrade,"
37     echo "                         install-build-prerequisites, pretend-build-prerequisites"
38   echo   echo
39   echo "method, name, version and build must be given !"   echo "method, name, version and build must be given !"
40   echo   echo
# Line 151  depwalking() Line 152  depwalking()
152   fi   fi
153   fi   fi
154    
155     if [[ ${METHOD} = install-build-prerequisites ]] || \
156     [[ ${METHOD} = pretend-build-prerequisites ]]
157     then
158     # only one time
159     if [[ ${LOOP_COUNTER} -lt 1 ]]
160     then
161     # only if SDEPEND is not zero
162     if [ -n "${SDEPEND}" ]
163     then
164     # crlf is substantly needed !!
165     if [ -n "${MY_DEPEND}" ]
166     then
167     MY_DEPEND="${MY_DEPEND}
168     ${SDEPEND}"
169     else
170     MY_DEPEND="${SDEPEND}"
171     fi
172     fi
173     fi
174     LOOP_COUNTER=${LOOP_COUNTER}+1
175     fi
176    
177   unset DEPEND   unset DEPEND
178   unset SDEPEND   unset SDEPEND
179    
# Line 212  EOF Line 235  EOF
235  [[ ${METHOD} = pretend ]] || \  [[ ${METHOD} = pretend ]] || \
236   [[ ${METHOD} = srcpretend ]] || \   [[ ${METHOD} = srcpretend ]] || \
237   [[ ${METHOD} = uppretend ]] || \   [[ ${METHOD} = uppretend ]] || \
238   [[ ${METHOD} = srcuppretend ]] && \   [[ ${METHOD} = srcuppretend ]] || \
239     [[ ${METHOD} = pretend-build-prerequisites ]] && \
240   echo -n "Calculating dependencies ... "   echo -n "Calculating dependencies ... "
241    
242    
# Line 250  then Line 274  then
274   fi   fi
275   done   done
276  else  else
277     LOOP_COUNTER=0
278   # get all dependencies of the package   # get all dependencies of the package
279   depwalking ${MAGEFILE}   depwalking ${MAGEFILE}
280  fi  fi
281    
282  # now add the package itself to the dependencies  if [[ ${METHOD} != install-build-prerequisites ]] &&
283  # (if not exists already)   [[ ${METHOD} != pretend-build-prerequisites ]]
 if checklist_alldeps "${MAGEFILE}"  
284  then  then
285   ALLDEPS="${ALLDEPS} ${MAGEFILE}"   # now add the package itself to the dependencies
286     # (if not exists already)
287     if checklist_alldeps "${MAGEFILE}"
288     then
289     ALLDEPS="${ALLDEPS} ${MAGEFILE}"
290     fi
291  fi  fi
292    
293  [[ ${METHOD} = pretend ]] || \  [[ ${METHOD} = pretend ]] || \
294   [[ ${METHOD} = srcpretend ]] || \   [[ ${METHOD} = srcpretend ]] || \
295   [[ ${METHOD} = uppretend ]] || \   [[ ${METHOD} = uppretend ]] || \
296   [[ ${METHOD} = srcuppretend ]] && \   [[ ${METHOD} = srcuppretend ]] || \
297     [[ ${METHOD} = pretend-build-prerequisites ]] && \
298   echo "done"   echo "done"
299    
300    
# Line 272  fi Line 302  fi
302  if [[ ${METHOD} = pretend ]] || \  if [[ ${METHOD} = pretend ]] || \
303   [[ ${METHOD} = srcpretend ]] || \   [[ ${METHOD} = srcpretend ]] || \
304   [[ ${METHOD} = uppretend ]] || \   [[ ${METHOD} = uppretend ]] || \
305   [[ ${METHOD} = srcuppretend ]]   [[ ${METHOD} = srcuppretend ]] || \
306     [[ ${METHOD} = pretend-build-prerequisites ]]
307  then  then
308   # this is a little bit faster   # this is a little bit faster
309   declare -i x=0   declare -i x=0
# Line 331  fi Line 362  fi
362  [[ ${METHOD} = install ]] || \  [[ ${METHOD} = install ]] || \
363   [[ ${METHOD} = srcinstall ]] || \   [[ ${METHOD} = srcinstall ]] || \
364   [[ ${METHOD} = upgrade ]] || \   [[ ${METHOD} = upgrade ]] || \
365   [[ ${METHOD} = srcupgrade ]] && \   [[ ${METHOD} = srcupgrade ]] || \
366     [[ ${METHOD} = install-build-prerequisites ]] && \
367   echo "${ALLDEPS}"   echo "${ALLDEPS}"

Legend:
Removed from v.2195  
changed lines
  Added in v.2210