add similar message about aborting remaining items in queue when a compilation fails.

This commit is contained in:
chess.griffin 2009-01-09 00:01:17 +00:00
parent 665e7277ea
commit 76ec9804f5

View File

@ -1139,7 +1139,6 @@ else
upgradepkg --reinstall --install-new $OUTPUT/$INSTPKG upgradepkg --reinstall --install-new $OUTPUT/$INSTPKG
echo "Done upgrading/installing package." echo "Done upgrading/installing package."
fi fi
rm -rf $TMP/sbopkg_install.lck
} }
checksum_fail () { checksum_fail () {
@ -1218,13 +1217,31 @@ else
fi fi
echo "Building Slackware package for $PKG..." echo "Building Slackware package for $PKG..."
export $BUILDOPTIONS export $BUILDOPTIONS
sh $PKG.SlackBuild.build || rm -rf $TMP/sbopkg_build.lck sh $PKG.SlackBuild.build
cd $OUTPUT cd $OUTPUT
if [ ! -e *.tgz ]; then if [ ! -e *.tgz ]; then
echo "$PKG:" >> $SUMMARYLOG echo "$PKG:" >> $SUMMARYLOG
echo "Error occurred with build. Please check the log." \ echo "Error occurred with build. Please check the log." \
>> $SUMMARYLOG >> $SUMMARYLOG
echo >> $SUMMARYLOG echo >> $SUMMARYLOG
if [ "$BUILDPKGS" = 1 ]; then
echo
echo "Would you like to continue processing the rest of the"
echo "build queue or would you like to abort? If this failed"
echo "package is a dependency of another package in the queue"
echo "then it may not make sense to continue."
echo
echo "Press (Y)es to continue or (N)o to abort."
read ANS
case $ANS in
y* | Y* ) continue
;;
n* | N* ) rm -rf $TMP/sbopkg_build.lck && return
;;
* ) echo "Unknown response."
;;
esac
fi
else else
echo "Done building package for $PKG." echo "Done building package for $PKG."
NEWPACKAGE=$(ls -1 *.tgz) NEWPACKAGE=$(ls -1 *.tgz)