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.

2 files changed, 0 insertions, 4 deletions

diff --git a/debian/etc/X11/xinit/xinitrc.d/80-gnunet-user-services b/debian/etc/X11/xinit/xinitrc.d/80-gnunet-user-services
index aff1dd78c..d780b0e8e 100644
--- a/debian/etc/X11/xinit/xinitrc.d/80-gnunet-user-services
+++ b/debian/etc/X11/xinit/xinitrc.d/80-gnunet-user-services
@@ -9,7 +9,6 @@ if [ "$gnunet_proxy" ]; then
         port=$((8000+$(id -u "$user")))
 
         gnunet-config -c "$HOME/.config/gnunet.conf" \
-                --rewrite \
                 --section=gns-proxy \
                 --option=OPTIONS \
                 --value="-p $port"
diff --git a/debian/gnunet.postinst b/debian/gnunet.postinst
index 07e5202e8..b6317f5be 100644
--- a/debian/gnunet.postinst
+++ b/debian/gnunet.postinst
@@ -149,12 +149,10 @@ EOF
                     fi
                     port=$((8000+$(id -u "${users[$i]}")))
                     gnunet-config -c "${homedirs[$i]}/.config/gnunet.conf" \
-                         --rewrite \
                          --section=gns-proxy \
                          --option=IMMEDIATE_START \
                          --value=YES
                     gnunet-config -c "${homedirs[$i]}/.config/gnunet.conf" \
-                         --rewrite \
                          --section=gns-proxy \
                          --option=OPTIONS \
                                      --value="-p $port"
@@ -180,7 +178,6 @@ if [ "$gnunet_proxy" ]; then
         port=$((8000+$(id -u $user)))
 
         gnunet-config -c $HOME/.config/gnunet.conf \
-                --rewrite \
                 --section=gns-proxy \
                 --option=OPTIONS \
                 --value="-p $port"