mirror of
https://github.com/sbopkg/sbopkg
synced 2024-12-31 10:23:25 +01:00
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:
parent
ba834c8b3e
commit
746358a451
1 changed files with 18 additions and 11 deletions
|
@ -1096,11 +1096,11 @@ 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
|
||||||
;;
|
;;
|
||||||
|
@ -1124,13 +1124,19 @@ info_item() {
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
Extract )
|
Extract )
|
||||||
extract_tarball $SHORTPATH $REPO_DIR/$CATEGORY
|
if [[ ! -z $REPO_GPG ]]; then
|
||||||
if [[ $? == 0 ]]; then
|
extract_tarball $SHORTPATH $REPO_DIR/$CATEGORY
|
||||||
dialog --title "Done" --msgbox "$(crunch "The \
|
if [[ $? == 0 ]]; then
|
||||||
tarball has been extracted.")" 8 30
|
dialog --title "Done" --msgbox "$(crunch "The \
|
||||||
|
tarball has been extracted.")" 8 30
|
||||||
|
else
|
||||||
|
RETVAL=1
|
||||||
|
break
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
RETVAL=1
|
dialog --title "ERROR" --msgbox "$(crunch "GPG \
|
||||||
break
|
tarballs are not available for the $REPO_NAME \
|
||||||
|
repository.")" 8 30
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
Queue ) add_item_to_queue $APP ;;
|
Queue ) add_item_to_queue $APP ;;
|
||||||
|
@ -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"
|
||||||
|
|
Loading…
Reference in a new issue