[2/5] fff-gateway: provide specific error if config version is not set

Submitted by Adrian Schmutzler on April 25, 2020, 5:51 p.m.

Details

Message ID 20200425175114.2152-2-freifunk@adrianschmutzler.de
State Superseded
Headers show

Commit Message

Adrian Schmutzler April 25, 2020, 5:51 p.m.
This explicitly checks whether the config version is set at all,
instead of just comparing it, and provides a specific error message
for that case.

Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
---
 src/packages/fff/fff-gateway/files/etc/gateway.d/01-version | 6 ++++++
 1 file changed, 6 insertions(+)

Patch hide | download patch | download mbox

diff --git a/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version b/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version
index 9d303223..6758fa81 100644
--- a/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version
+++ b/src/packages/fff/fff-gateway/files/etc/gateway.d/01-version
@@ -10,6 +10,12 @@  configure() {
 	fi
 
 	# check version of configuration
+	if ! [ -n "$config_version" ]; then
+		echo "ERROR: No config version given. Supported versions: '1'"
+
+		exit 1
+	fi
+
 	if [ "$config_version" != "$expected_version" ]; then
 		echo "ERROR: Invalid config version. Expected '$expected_version', got '$config_version'."
 		echo "Please check what has been changed and adjust your config appropriately."

Comments

Fabian Blaese April 26, 2020, 11:11 a.m.
Reviewed-by: Fabian Bläse <fabian@blaese.de>
Fabian Blaese April 26, 2020, 11:26 a.m.
Hallo Adrian,

gibt es einen speziellen Grund, warum du expected_version nicht verwendet hast?
Ich würde das gerne nicht doppelt haben, sonst vergessen wir irgendwann mal eins von beiden.

Gruß
Fabian