Backup_Repos/pentoo-overlay
1
0
Fork 0
mirror of https://github.com/pentoo/pentoo-overlay synced 2026-04-28 09:40:59 +02:00
Code Issues Projects Releases Wiki Activity

pentoo-updater: update the kernel too, double check python works after reset

Browse source
This commit is contained in:
Rick Farina (Zero_Chaos) 2018-07-27 15:14:05 -04:00
parent 81795cd4a9
commit 12e5f64838
No known key found for this signature in database
GPG key ID: A5DD1427DD11F94A
1 changed files with 16 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
scripts/pentoo-updater.sh
View file

@ -116,6 +116,17 @@ update_kernel() {
fi
}
safe_exit() {
#I want a shell when I'm in catalyst but just an exit on failure for users
if [ -n "${clst_target}" ] && [ -n "${debugshell}" ]; then
/bin/bash
elif [ -n "${clst_target}" ] && [ -n "${reckless}" ]; then
echo "Continuing despite failure...grumble grumble" 1>&2
#else #let's let it keep going by default instead of just failing out
# exit
fi
}
check_profile
if [ -n "${clst_target}" ]; then #we are in catalyst
mkdir -p /var/log/portage/emerge-info/
@ -158,17 +169,6 @@ else #we are on a user system
fi
fi
safe_exit() {
#I want a shell when I'm in catalyst but just an exit on failure for users
if [ -n "${clst_target}" ] && [ -n "${debugshell}" ]; then
/bin/bash
elif [ -n "${clst_target}" ] && [ -n "${reckless}" ]; then
echo "Continuing despite failure...grumble grumble" 1>&2
#else #let's let it keep going by default instead of just failing out
# exit
fi
}
RESET_PYTHON=0
#first we set the python interpreters to match PYTHON_TARGETS (and ensure the versions we set are actually built)
PYTHON2=$(emerge --info | grep -oE 'PYTHON_TARGETS\="(python[23]_[0-9]\s*)+"' | head -n1 | cut -d\" -f2 | cut -d" " -f 1 |sed 's#_#.#')
@ -227,6 +227,8 @@ emerge --deep --update --newuse -kb --changed-use --newrepo @world || safe_exit
if [ ${RESET_PYTHON} = 1 ]; then
eselect python set --python2 "${PYTHON2}" || safe_exit
eselect python set --python3 "${PYTHON3}" || safe_exit
"${PYTHON2}" -c "from _multiprocessing import SemLock" || emerge -1 python:"${PYTHON2#python}"
"${PYTHON3}" -c "from _multiprocessing import SemLock" || emerge -1 python:"${PYTHON3#python}"
fi
#if we are in catalyst, update the extra binpkgs
@ -271,6 +273,6 @@ elif [ -f /var/db/repos/pentoo/scripts/bug-461824.sh ]; then
/var/db/repos/pentoo/scripts/bug-461824.sh
fi
#if [ -z "${clst_target}" ]; then
# update_kernel
#fi
if [ -z "${clst_target}" ]; then
update_kernel
fi