openmamba/autodist
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

autodist: avoid calling autospec send with --nosrpm --norpm (for autoport)

Browse Source
This commit is contained in:
Silvan Calarco 2013-05-22 00:02:14 +02:00
parent 8fa299b2f2
commit d99d231b47
1 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
autodist
View File

@ -1263,9 +1263,11 @@ for JOB_NUM in `seq 1 ${#JOBNAME[*]}`; do
exit 1 ;; exit 1 ;;
esac esac
} }
echo "== sending source rpms" # avoid calling autospec with --nosrpm --norpm (not working as expected and not useful)
launch_pkgs_loop send "$AUTOSPEC_ARGS --norpm $SEND_SERVER_CMD" if [ "$AUTOSPEC_ARGS/--nosrpm" = "$AUTOSPEC_ARGS" ]; then
if [ $? -gt 0 ]; then echo "== sending source rpms"
launch_pkgs_loop send "$AUTOSPEC_ARGS --norpm $SEND_SERVER_CMD"
if [ $? -gt 0 ]; then
case $SEVERITY in case $SEVERITY in
0) ;; 0) ;;
1) echo "%! Error sending sources; skipping $JOB_NAME job." 1) echo "%! Error sending sources; skipping $JOB_NAME job."
@ -1273,15 +1275,16 @@ for JOB_NUM in `seq 1 ${#JOBNAME[*]}`; do
*) echo "!! Error sending sources; aborting." *) echo "!! Error sending sources; aborting."
exit 1 ;; exit 1 ;;
esac esac
else else
# archive patches # archive patches
if [ "$do_autobuild" ]; then if [ "$do_autobuild" ]; then
[ -e $AUTOUPDATEDIR/spec-patches-update/$JOB_NAME.spec.patch ] && \ [ -e $AUTOUPDATEDIR/spec-patches-update/$JOB_NAME.spec.patch ] && \
mv $AUTOUPDATEDIR/spec-patches-update/$JOB_NAME.spec.patch \ mv $AUTOUPDATEDIR/spec-patches-update/$JOB_NAME.spec.patch \
$AUTOUPDATEDIR/spec-patches-update/old/${JOB_NAME}.spec.${DATE_NOW}.patch $AUTOUPDATEDIR/spec-patches-update/old/${JOB_NAME}.spec.${DATE_NOW}.patch
[ -e $AUTOUPDATEDIR/spec-patches-build/$JOB_NAME.spec.patch ] && \ [ -e $AUTOUPDATEDIR/spec-patches-build/$JOB_NAME.spec.patch ] && \
mv $AUTOUPDATEDIR/spec-patches-build/${JOB_NAME}.spec.${DATE_NOW}.patch \ mv $AUTOUPDATEDIR/spec-patches-build/${JOB_NAME}.spec.${DATE_NOW}.patch \
$AUTOUPDATEDIR/spec-patches-build/old/${JOB_NAME}.spec.${DATE_NOW}.patch $AUTOUPDATEDIR/spec-patches-build/old/${JOB_NAME}.spec.${DATE_NOW}.patch
fi
fi fi
fi fi
fi fi