autodist: don't update package version when --rebuild is passed

This commit is contained in:
Silvan Calarco 2013-05-30 13:19:38 +02:00
parent 272860e5fe
commit 74876ce852

View File

@ -1133,17 +1133,19 @@ for JOB_NUM in `seq 1 ${#JOBNAME[*]}`; do
echo "%% "`log_date`" Starting UPDATE operation" > $LOGFILE
if [ "${JOB_VER:0:1}" != "+" -o "${JOB_VER}" = "+0" ]; then
# --force-update \
# check legacylist
awk '{ print $1 }' $LEGACYLIST | grep "^$JOB_NAME$" >/dev/null && {
echo "?= Job $JOB_NAME is in the legacy list; forcing rebuild"
ret=1
} || {
[ "${AUTOSPEC_ARGS/--changelog}" = "${AUTOSPEC_ARGS}" ] &&
AUTOSPEC_ARGS="$AUTOSPEC_ARGS --changelog \"automatic update by autodist\""
launch_pkgs_loop autoupdate "$AUTOSPEC_ARGS $SEND_FORCE"
ret=$?
}
ret=1
# don't update when --rebuild is passed
if [ ! "$rebuild_packages" ]; then
# check legacylist
awk '{ print $1 }' $LEGACYLIST | grep "^$JOB_NAME$" >/dev/null && {
echo "?= Job $JOB_NAME is in the legacy list; forcing rebuild"
} || {
[ "${AUTOSPEC_ARGS/--changelog}" = "${AUTOSPEC_ARGS}" ] &&
AUTOSPEC_ARGS="$AUTOSPEC_ARGS --changelog \"automatic update by autodist\""
launch_pkgs_loop autoupdate "$AUTOSPEC_ARGS $SEND_FORCE"
ret=$?
}
fi
if [ $ret != 0 ]; then
if [ ! "$rebuild_packages" -a "${JOB_VER}" != "+0" ]; then
[ $ret -ge 2 -a "$do_autobuild" ] && {