Miroirs/sbopkg
1
0
Fork 0
mirror of https://github.com/sbopkg/sbopkg synced 2024-12-31 10:23:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

more process_queue cleanups

Browse source
This commit is contained in:
chess.griffin 2009-05-14 19:47:23 +00:00
parent 6bd48b9f8a
commit fe357d64e4
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/usr/sbin/sbopkg
View file

@ -2691,6 +2691,8 @@ process_queue() {
echo "Package $COUNTER: $CHKBUILD" >> $TMPLOG echo "Package $COUNTER: $CHKBUILD" >> $TMPLOG
if ! search_package $CHKBUILD; then if ! search_package $CHKBUILD; then
echo "$CHKBUILD not found!" >> $TMPLOG echo "$CHKBUILD not found!" >> $TMPLOG
echo >> $TMPLOG
COUNTER=$((COUNTER+1))
continue continue
else else
echo $CHKBUILD >> $FINALQUEUE echo $CHKBUILD >> $FINALQUEUE
@ -2724,9 +2726,7 @@ process_queue() {
done done
echo "------------------------------------------" >> $TMPLOG echo "------------------------------------------" >> $TMPLOG
if [[ ! -e $FINALQUEUE ]]; then if [[ ! -e $FINALQUEUE ]]; then
echo "No valid file names in the queue. Exiting." return 1
cleanup
exit 1
fi fi
if [[ $DIAG ]]; then if [[ $DIAG ]]; then
dialog --title "Pre-Check Log" --ok-label "Start Build" \ dialog --title "Pre-Check Log" --ok-label "Start Build" \
@ -2812,6 +2812,11 @@ process_queue() {
echo "------------------------------------------" >> $TMPLOG echo "------------------------------------------" >> $TMPLOG
echo "PACKAGE BUILDING/INSTALLATION SUMMARY LOG" >> $TMPLOG echo "PACKAGE BUILDING/INSTALLATION SUMMARY LOG" >> $TMPLOG
echo "Using the $REPO_DESC" >> $TMPLOG echo "Using the $REPO_DESC" >> $TMPLOG
if [[ $QUEUETYPE == "buildinstall" ]]; then
echo "Queue process: build and install" >> $TMPLOG
else
echo "Queue process: build" >> $TMPLOG
fi
cat $TMPSUMMARYLOG >> $TMPLOG cat $TMPSUMMARYLOG >> $TMPLOG
rm $TMPSUMMARYLOG rm $TMPSUMMARYLOG
echo >> $TMPLOG echo >> $TMPLOG
@ -2856,9 +2861,17 @@ start_dialog_queue() {
;; ;;
0 ) # Build and install 0 ) # Build and install
process_queue buildinstall process_queue buildinstall
if [[ $? == 1 ]]; then
dialog --title "Error" --msgbox "$(crunch "No valid \
packages found.")" 8 40
fi
;; ;;
1 ) # Build only 1 ) # Build only
process_queue build process_queue build
if [[ $? == 1 ]]; then
dialog --title "Error" --msgbox "$(crunch "No valid \
packages found.")" 8 40
fi
;; ;;
esac esac
} }
@ -3473,6 +3486,10 @@ else
rm -f $CLIQUEUE rm -f $CLIQUEUE
unset CLIQUEUE unset CLIQUEUE
process_queue $TYPE process_queue $TYPE
if [[ $? == 1 ]]; then
echo "No valid packages found. Exiting."
exit 1
fi
fi fi
if [[ $CHK_UPDATES ]]; then if [[ $CHK_UPDATES ]]; then