show package name when error occurs during build; move gpg checks a bit so we can still edit info and slackbuild files when using the local repository

This commit is contained in:
chess.griffin 2009-07-13 16:54:09 +00:00
parent ba834c8b3e
commit 746358a451

View file

@ -1096,12 +1096,12 @@ info_item() {
RETVAL=1 RETVAL=1
break break
fi fi
fi
extract_tarball $SHORTPATH $REPO_DIR/$CATEGORY extract_tarball $SHORTPATH $REPO_DIR/$CATEGORY
if [[ $? == 1 ]]; then if [[ $? == 1 ]]; then
RETVAL=1 RETVAL=1
break break
fi fi
fi
customize_item customize_item
;; ;;
Remove ) remove_sources_for_app $SHORTPATH/$APP.info ;; Remove ) remove_sources_for_app $SHORTPATH/$APP.info ;;
@ -1124,6 +1124,7 @@ info_item() {
fi fi
;; ;;
Extract ) Extract )
if [[ ! -z $REPO_GPG ]]; then
extract_tarball $SHORTPATH $REPO_DIR/$CATEGORY extract_tarball $SHORTPATH $REPO_DIR/$CATEGORY
if [[ $? == 0 ]]; then if [[ $? == 0 ]]; then
dialog --title "Done" --msgbox "$(crunch "The \ dialog --title "Done" --msgbox "$(crunch "The \
@ -1132,6 +1133,11 @@ info_item() {
RETVAL=1 RETVAL=1
break break
fi fi
else
dialog --title "ERROR" --msgbox "$(crunch "GPG \
tarballs are not available for the $REPO_NAME \
repository.")" 8 30
fi
;; ;;
Queue ) add_item_to_queue $APP ;; Queue ) add_item_to_queue $APP ;;
Build ) Build )
@ -2931,6 +2937,7 @@ build_package() {
echo " Error occurred with build. Please check the log." \ echo " Error occurred with build. Please check the log." \
>> $TMPSUMMARYLOG >> $TMPSUMMARYLOG
echo echo
echo "$PKGNAME:"
echo "Would you like to continue processing the rest of the" echo "Would you like to continue processing the rest of the"
echo "build queue or would you like to abort? If this failed" echo "build queue or would you like to abort? If this failed"
echo "package is a dependency of another package in the queue" echo "package is a dependency of another package in the queue"