upstream/certbot
1
0
Fork 0
mirror of https://github.com/certbot/certbot.git synced 2026-06-05 23:04:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Update message

Browse source
This commit is contained in:
Adrien Ferrand 2019-10-21 00:02:28 +02:00
parent 5f57e49162
commit 5d422eb82c
2 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
letsencrypt-auto-source/letsencrypt-auto
View file

@ -376,6 +376,9 @@ BootstrapDebCommon() {
# Sets TOOL to the name of the package manager
# Sets appropriate values for YES_FLAG and QUIET_FLAG based on $ASSUME_YES and $QUIET_FLAG.
# Note: this function is called both while selecting the bootstrap scripts and
# during the actual bootstrap. Some things like prompting to user can be done in the latter
# case, but not in the former one.
InitializeRPMCommonBase() {
if type dnf 2>/dev/null
then
@ -830,7 +833,6 @@ elif [ -f /etc/redhat-release ]; then
# Check if an automated bootstrap can be achieved on this system.
if ! Python36SclIsAvailable; then
INTERACTIVE_BOOTSTRAP=1
INTERACTIVE_BOOTSTRAP_MESSAGE="Enable the SCL repository and try running Certbot again."
fi
Bootstrap() {
@ -1176,11 +1178,9 @@ if [ "$1" = "--le-auto-phase2" ]; then
# Otherwise bootstrap needs to be done manually by the user.
else
# If it is because of the bootstrap, --non-interactive will be of no use.
# Display the OS-specific interactive bootstrap message.
if [ "$INTERACTIVE_BOOTSTRAP" = 1 ]; then
error "Skipping upgrade because new OS dependencies may need to be installed."
error "This requires a manual user intervention."
error "$INTERACTIVE_BOOTSTRAP_MESSAGE"
error "This requires a manual user intervention: please run this script again manually."
# If this is because of the environment (eg. non interactive shell without
# --non-interactive flag set), help the user in that direction.
else

5
letsencrypt-auto-source/letsencrypt-auto.template
View file

@ -358,7 +358,6 @@ elif [ -f /etc/redhat-release ]; then
# Check if an automated bootstrap can be achieved on this system.
if ! Python36SclIsAvailable; then
INTERACTIVE_BOOTSTRAP=1
INTERACTIVE_BOOTSTRAP_MESSAGE="Enable the SCL repository and try running Certbot again."
fi
Bootstrap() {
@ -596,11 +595,9 @@ if [ "$1" = "--le-auto-phase2" ]; then
# Otherwise bootstrap needs to be done manually by the user.
else
# If it is because of the bootstrap, --non-interactive will be of no use.
# Display the OS-specific interactive bootstrap message.
if [ "$INTERACTIVE_BOOTSTRAP" = 1 ]; then
error "Skipping upgrade because new OS dependencies may need to be installed."
error "This requires a manual user intervention."
error "$INTERACTIVE_BOOTSTRAP_MESSAGE"
error "This requires a manual user intervention: please run this script again manually."
# If this is because of the environment (eg. non interactive shell without
# --non-interactive flag set), help the user in that direction.
else