diff --git a/build/common.sh b/build/common.sh index b2eef59..637076d 100644 --- a/build/common.sh +++ b/build/common.sh @@ -807,6 +807,7 @@ search_packages() BASEDIR=${1} PKGNAME=${2} PKGVERS=${3} + PKGBRCH=${4} # check whether the package has already been built PKGFILE=${BASEDIR}${PACKAGESDIR}/All/${PKGNAME}-${PKGVERS}.pkg @@ -820,7 +821,7 @@ search_packages() if [ -L ${PKGLINK} ]; then PKGFILE=$(readlink -f ${PKGLINK} || true) if [ -f ${PKGFILE} ]; then - echo ">>> Skipped version ${PKGVERS} for ${PKGNAME}" >> ${BASEDIR}/.pkg-msg + echo ">>> Skipped version ${PKGVERS} for ${PKGNAME} from ${PKGBRCH}" >> ${BASEDIR}/.pkg-msg return 0 fi fi diff --git a/build/core.sh b/build/core.sh index ce4901b..36f696d 100644 --- a/build/core.sh +++ b/build/core.sh @@ -74,7 +74,7 @@ for BRANCH in ${EXTRABRANCH} ${COREBRANCH}; do fi done - if search_packages ${STAGEDIR} ${CORE_NAME} ${CORE_VERS}; then + if search_packages ${STAGEDIR} ${CORE_NAME} ${CORE_VERS} ${BRANCH}; then # already built continue fi diff --git a/build/plugins.sh b/build/plugins.sh index a43396d..8d9dcf4 100644 --- a/build/plugins.sh +++ b/build/plugins.sh @@ -119,7 +119,7 @@ for BRANCH in ${EXTRABRANCH} ${PLUGINSBRANCH}; do fi done - if search_packages ${STAGEDIR} ${PLUGIN_NAME} ${PLUGIN_VERS}; then + if search_packages ${STAGEDIR} ${PLUGIN_NAME} ${PLUGIN_VERS} ${BRANCH}; then # already built continue fi