Skip to content

Commit

Permalink
Version bump to 1.0.27 (use --full-build-fallback-threshold with emtee)
Browse files Browse the repository at this point in the history
  • Loading branch information
sakaki- committed Apr 30, 2020
1 parent 2458104 commit 0c8f29e
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 3 deletions.
14 changes: 12 additions & 2 deletions genup
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ shopt -s nullglob

# ********************** variables *********************
PROGNAME="$(basename "${0}")"
VERSION="1.0.26"
VERSION="1.0.27"
ETCPROFILE="/etc/profile"
UPDATERSDIR="/etc/${PROGNAME}/updaters.d"
RED_TEXT="" GREEN_TEXT="" YELLOW_TEXT="" RESET_ATTS="" ALERT_TEXT=""
Expand Down Expand Up @@ -60,6 +60,7 @@ BUILDKERNELARGS=""
EIXSYNCARGS=""
PUMP=""
NOPUMP="-distcc -distcc-pump"
FALLBACK_SENTINEL="/tmp/.full-emptytree-emerge-performed"
PORTAGEINFO=""
PORTAGEFEATURES=""
USE_NOCACHE=false
Expand Down Expand Up @@ -260,7 +261,8 @@ try_emtee_update_if_enabled() {
# emerge afterwards anyhow
show "Attempting to update @world set (for new versions, or changed use flags)"
show "using emtee..."
if ${PUMP} emtee ${ASKFLAG} ${ALERTFLAG} ${VERBOSITYFLAG} --emerge-args="${EMERGEARGS}"; then
rm -f "${FALLBACK_SENTINEL}"
if ${PUMP} emtee ${ASKFLAG} ${ALERTFLAG} ${VERBOSITYFLAG} --emerge-args="${EMERGEARGS}" --full-build-fallback-threshold=75; then
show "emtee run completed successfully!"
else
warning "emtee @world build did not complete successfully!"
Expand Down Expand Up @@ -546,6 +548,14 @@ display_final_status() {
if ((NEEDSDISPATCHCONF==1)); then
warning "There are configuration file changes pending review!"
warning "Please run dispatch-conf to interactively resolve them."
if "${USE_EMTEE}" && [[ -f "${FALLBACK_SENTINEL}" ]]; then
rm -f "${FALLBACK_SENTINEL}"
warning " TAKE CARE: a full --emptytree @world emerge has been performed;"
warning " you may need to retain your current version of many"
warning " configuration files - when prompted by dispatch-conf - to"
warning " retain full system functionality!"
warning " (use the 'z' / 'zap new' option where unsure)"
fi
else
show "There are no configuration file changes pending review."
fi
Expand Down
2 changes: 1 addition & 1 deletion genup.8
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
.TH GENUP 8 "Version 1.0.26: April 2020"
.TH GENUP 8 "Version 1.0.27: April 2020"
.SH NAME
genup \- update Portage tree, all installed packages, and kernel
.SH SYNOPSIS
Expand Down

0 comments on commit 0c8f29e

Please sign in to comment.