From db8fa88b9b12207be47911a60bc95820d10b054f Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Fri, 19 Feb 2016 12:06:41 +0100 Subject: [PATCH] autoport: apply strict repository check at first step only This means check is applied to command-line passed packages only --- autoport | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/autoport b/autoport index 0f0d3da..9643825 100755 --- a/autoport +++ b/autoport @@ -17,7 +17,7 @@ me=(${0##*/} $VERSION "Sat Mar 20 2011") function usage() { echo "\ ${me[0]} ${me[1]} -"$"Copyright (C) 2011-2014 Silvan Calarco "" +"$"Copyright (C) 2011-2016 Silvan Calarco "" "$"Released under the terms of the GNU GPL v3 license" echo " "$"Batch port and cross-build tool based on autodist."" @@ -542,7 +542,7 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do done [ ! "$DONT_PREPARE_THIS" -a ! "`grep ^$JOB_CURRENT\$ $DATAARCHDIR/preparedjobs`" ] && { echo -n "prepare" - if [ ! "$REBUILD_DEPENDANT_MODE" ]; then + if [ ! "$REBUILD_DEPENDANT_MODE" -a "$step" = "1" ]; then REPOSITORY_STRICT_ADD="--repository-strict" else REPOSITORY_STRICT_ADD="" @@ -550,7 +550,6 @@ for TARGET_ARCH in ${TARGET_ARCHS}; do [ "$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" 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 ] && { RES=`find_source_by_provide $PORT_REPOSITORY $JOB_CURRENT` for j in ${RES}; do