upstream/opnsense-tools
1
0
Fork 0
mirror of https://github.com/opnsense/tools.git synced 2026-06-09 00:33:48 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

build: show branch on skip in search_package()

Browse source 
When dealing with EXTRABRANCHES the output can be confusing when
a branch was not updated but we don't know which one.
This commit is contained in:
Franco Fichtner 2025-08-05 14:26:47 +02:00
parent 7276291c5c
commit 2d652965ac
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/common.sh
View file

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

2
build/core.sh
View file

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

2
build/plugins.sh
View file

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