From 165c3e32b0aef03bad8ac07528705c0ffd9c8a09 Mon Sep 17 00:00:00 2001 From: Will Greenberg Date: Fri, 1 Nov 2024 08:03:57 -0700 Subject: [PATCH] snap: fix generated postrefreshhook script (#9994) Fixes #9990 If the python oneliner to check certbot's version succeeded, exit_code would never be set, which would cause our exit_code check to fail. Use a check that handles unset exit_code --- tools/snap/generate_dnsplugins_postrefreshhook.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/snap/generate_dnsplugins_postrefreshhook.sh b/tools/snap/generate_dnsplugins_postrefreshhook.sh index 4a190d06a..cdccc3d95 100755 --- a/tools/snap/generate_dnsplugins_postrefreshhook.sh +++ b/tools/snap/generate_dnsplugins_postrefreshhook.sh @@ -25,7 +25,7 @@ cb_required=\$(grep -oP "version = '\K.*(?=')" \$SNAP/setup.py) \$SNAP/bin/python3 -c "import sys; from packaging import version; sys.exit(1) if\ version.parse('\$cb_installed') < version.parse('\$cb_required') else sys.exit(0)" || exit_code=\$? -if [ "\$exit_code" -eq 1 ]; then +if [ "\$exit_code" = "1" ]; then echo "Certbot is version \$cb_installed but needs to be at least \$cb_required before" \\ "this plugin can be updated; will try again on next refresh." exit 1