openwrt-mirror/packages
1
0
Fork 0
mirror of https://github.com/openwrt/packages.git synced 2025-12-21 19:14:30 +04:00
Code Issues Packages Projects Releases Wiki Activity

acme-common: fallback to deprecated use_staging if the staging option is not set

Browse Source 
The use_staging option was deprecated in 9d2d8787ca.
But it still has a bigger priority than the staging option.
This happens because config_get_bool returns 0 when the use_staging option wasn't set.
So the next check for the staging var emptiness is always false.

As the simplest fix, use the config_get staging that returns a plain string when the option is not set and if it's empty then fallback to the use_staging.

Once the use_staging option is removed we should get back to the config_get_bool staging.

Also use config_get_bool debug.

Signed-off-by: Sergey Ponomarev <stokito@gmail.com>
This commit is contained in:
Sergey Ponomarev
2024-05-26 07:33:30 +03:00
committed by Toke Høiland-Jørgensen
parent 4c4a7bd31d
commit dd662f8a12
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
net/acme-common/files/acme.init
View File

@@ -25,10 +25,10 @@ cleanup() {
load_options() { load_options() {
section=$1 section=$1
config_get staging "$section" staging
# compatibility for old option name # compatibility for old option name
config_get_bool staging "$section" use_staging
if [ -z "$staging" ]; then if [ -z "$staging" ]; then
config_get_bool staging "$section" staging 0 config_get_bool staging "$section" use_staging 0
fi fi
export staging export staging
config_get calias "$section" calias config_get calias "$section" calias
@@ -130,7 +130,7 @@ load_globals() {
fi fi
export state_dir export state_dir
config_get debug "$section" debug 0 config_get_bool debug "$section" debug 0
export debug export debug
# only look for the first acme section # only look for the first acme section