Magellan Linux

  • Back to homepage
    • /[magellan-source]/branches/mage-next/src/depwalker.in

    Diff of /branches/mage-next/src/depwalker.in

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

    revision 1564 by niro, Wed Dec 28 10:05:49 2011 UTC revision 2195 by niro, Thu Oct 10 11:05:34 2013 UTC
    # Line 179  depwalking() Line 179  depwalking()
    179   fi   fi
    180    
    181   HIGHEST_DEPFILE=$(dep2highest_magefile "${DEPNAME}")   HIGHEST_DEPFILE=$(dep2highest_magefile "${DEPNAME}")
    182     if [[ -z ${HIGHEST_DEPFILE} ]]
    183     then
    184     INVALID_DEPS+=" ${DEPNAME}:${DFILE}"
    185     continue
    186     fi
    187    
    188   PCAT="$(magename2pcat ${HIGHEST_DEPFILE})"   PCAT="$(magename2pcat ${HIGHEST_DEPFILE})"
    189   PNAME="$(magename2pname ${HIGHEST_DEPFILE})"   PNAME="$(magename2pname ${HIGHEST_DEPFILE})"
    # Line 242  then Line 247  then
    247   then   then
    248   # get dependencies the package   # get dependencies the package
    249   depwalking ${MAGEFILE}   depwalking ${MAGEFILE}
       
      # now add the package itself to the dependencies  
      # (if not exists already)  
      #if [ -z "$(echo ${ALLDEPS} | fgrep "${MAGEFILE}")" ]  
      if checklist_alldeps "${MAGEFILE}"  
      then  
      ALLDEPS="${ALLDEPS} ${MAGEFILE}"  
      fi  
    250   fi   fi
    251   done   done
    252  else  else
    253   # get all dependencies of the package   # get all dependencies of the package
    254   depwalking ${MAGEFILE}   depwalking ${MAGEFILE}
    255    fi
    256    
    257   # now add the package itself to the dependencies  # now add the package itself to the dependencies
    258    # (if not exists already)
    259    if checklist_alldeps "${MAGEFILE}"
    260    then
    261   ALLDEPS="${ALLDEPS} ${MAGEFILE}"   ALLDEPS="${ALLDEPS} ${MAGEFILE}"
    262  fi  fi
    263    
    # Line 299  then Line 300  then
    300   echo -e "${list}"   echo -e "${list}"
    301   echo   echo
    302    
    303     if [[ ! -z ${INVALID_DEPS} ]]
    304     then
    305     echo -e "${COLRED}Invalid dependencies found:${COLDEFAULT}"
    306     for i in ${INVALID_DEPS}
    307     do
    308     _dep="${i%%:*}"
    309     _mage="${i##*:}"
    310     echo -e "${COLRED} '${_dep}' -> '${_mage}'${COLDEFAULT}"
    311     done
    312     echo
    313     fi
    314    
    315   if [[ ! -z ${NO_UPGRADE_CANDIDATE} ]]   if [[ ! -z ${NO_UPGRADE_CANDIDATE} ]]
    316   then   then
    317   echo -e "${COLRED}Currently no candidates found for:${COLDEFAULT}"   echo -e "${COLRED}Currently no candidates found for:${COLDEFAULT}"
    Legend:
    Removed from v.1564  
    changed lines
      Added in v.2195