summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorAlessio Vanni <vannilla@firemail.cc>2021-04-24 17:29:42 +0200
committerAlessio Vanni <vannilla@firemail.cc>2021-04-24 17:29:42 +0200
commit8233e282046e27de57de75f175e131a974087618 (patch)
treefba261f13d3a6225221a42082f561a3152969f82 /contrib
parent3cd24823660a0447e590ff352e9da7eb076b292b (diff)
Swap gnunet-config's default behaviour for the rewrite flag
With the previous default, a configuration file could keep values different from the defaults even when the user did not explicitly edit that option, potentially leading to buggy behaviour. For example: GNUnet's version X+1 changes the default value for a certain option A, but anyone who has edited the configuration file with version X or earlier, would still have got the old default for A even when updating to version X+1. It was possible to write only the edited parts, but that required explicitly passing the `--rewrite' (or `-w') flag. The default behaviour has now been swapped so that the resulting file contains only differences, while a "frozen" configuration is generated with the `--rewrite' flag. Also, as it's a minor change: a function used internally by the logging component was using translated strings to check the requested log level. This behaviour is buggy as passing an untranslated string to e.g. `GNUNET_log_setup', while the current locale is different and a translation for that string exists, would generate a different log level than the one requested.
Diffstat (limited to 'contrib')
-rw-r--r--contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd3
-rw-r--r--contrib/packages/alpine/gnunet/gnunet.xsession1
2 files changed, 0 insertions, 4 deletions
diff --git a/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd b/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd
index 3c5a22ee2..2a4dcc1c4 100644
--- a/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd
+++ b/contrib/packages/alpine/gnunet/gnunet-gns-proxy.initd
@@ -21,12 +21,10 @@ start() {
# Customize gnunet.conf
port=$((8000+$(id -u $user)))
gnunet-config -c /home/$user/.config/gnunet.conf \
- --rewrite \
--section=gns-proxy \
--option=IMMEDIATE_START \
--value=YES
gnunet-config -c /home/$user/.config/gnunet.conf \
- --rewrite \
--section=gns-proxy \
--option=OPTIONS \
--value="-p $port"
@@ -79,7 +77,6 @@ stop() {
# Disable gns-proxy in config
gnunet-config -c /home/$user/.config/gnunet.conf \
- --rewrite \
--section=gns-proxy \
--option=IMMEDIATE_START \
--value=NO
diff --git a/contrib/packages/alpine/gnunet/gnunet.xsession b/contrib/packages/alpine/gnunet/gnunet.xsession
index 944d47a27..dead5c783 100644
--- a/contrib/packages/alpine/gnunet/gnunet.xsession
+++ b/contrib/packages/alpine/gnunet/gnunet.xsession
@@ -10,7 +10,6 @@ if [ "$gnunet_proxy" ]; then
port=$((8000+$(id -u $user)))
gnunet-config -c /home/$user/.config/gnunet.conf \
- --rewrite \
--section=gns-proxy \
--option=OPTIONS \
--value="-p $port"