autoport: apply strict repository check at first step only

This means check is applied to command-line passed packages only
This commit is contained in:
Silvan Calarco 2016-02-19 12:06:41 +01:00
parent f93a093134
commit db8fa88b9b

View File

@ -17,7 +17,7 @@ me=(${0##*/} $VERSION "Sat Mar 20 2011")
function usage() { function usage() {
echo "\ echo "\
${me[0]} ${me[1]} ${me[0]} ${me[1]}
"$"Copyright (C) 2011-2014 Silvan Calarco <silvan.calarco@mambasoft.it>"" "$"Copyright (C) 2011-2016 Silvan Calarco <silvan.calarco@mambasoft.it>""
"$"Released under the terms of the GNU GPL v3 license" "$"Released under the terms of the GNU GPL v3 license"
echo " echo "
"$"Batch port and cross-build tool based on autodist."" "$"Batch port and cross-build tool based on autodist.""
@ -542,7 +542,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
done done
[ ! "$DONT_PREPARE_THIS" -a ! "`grep ^$JOB_CURRENT\$ $DATAARCHDIR/preparedjobs`" ] && { [ ! "$DONT_PREPARE_THIS" -a ! "`grep ^$JOB_CURRENT\$ $DATAARCHDIR/preparedjobs`" ] && {
echo -n "prepare" echo -n "prepare"
if [ ! "$REBUILD_DEPENDANT_MODE" ]; then if [ ! "$REBUILD_DEPENDANT_MODE" -a "$step" = "1" ]; then
REPOSITORY_STRICT_ADD="--repository-strict" REPOSITORY_STRICT_ADD="--repository-strict"
else else
REPOSITORY_STRICT_ADD="" REPOSITORY_STRICT_ADD=""
@ -550,7 +550,6 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do
[ "$VERBOSE_MODE" ] && echo " [ "$VERBOSE_MODE" ] && echo "
%% COMMAND: LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY $REPOSITORY_STRICT_ADD --severity 2 -- $STAGEOPTS" %% COMMAND: LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY $REPOSITORY_STRICT_ADD --severity 2 -- $STAGEOPTS"
LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY $REPOSITORY_STRICT_ADD --severity 2 -- $STAGEOPTS &>$tmpfile LANG=C LC_ALL=C autodist -p ${JOB_CURRENT} --server $PORT_REPOSITORY --repository $PORT_REPOSITORY $REPOSITORY_STRICT_ADD --severity 2 -- $STAGEOPTS &>$tmpfile
cat $tmpfile >> $logfile
[ $? -gt 0 ] && { [ $? -gt 0 ] && {
RES=`find_source_by_provide $PORT_REPOSITORY $JOB_CURRENT` RES=`find_source_by_provide $PORT_REPOSITORY $JOB_CURRENT`
for j in ${RES}; do for j in ${RES}; do