BIND 10 trac945, updated. 37035a073be57c9f6d00f2558f74ce69b7067295 [trac945] Accept even 0 as a value

BIND 10 source code commits bind10-changes at lists.isc.org
Thu May 19 18:25:27 UTC 2011


The branch, trac945 has been updated
       via  37035a073be57c9f6d00f2558f74ce69b7067295 (commit)
      from  b5dc1d86b2a763f98d8414589a545fcbda09a36c (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 37035a073be57c9f6d00f2558f74ce69b7067295
Author: Michal 'vorner' Vaner <michal.vaner at nic.cz>
Date:   Thu May 19 20:22:44 2011 +0200

    [trac945] Accept even 0 as a value

-----------------------------------------------------------------------

Summary of changes:
 src/bin/zonemgr/zonemgr.py.in |   24 +++++++++++++++++++-----
 1 files changed, 19 insertions(+), 5 deletions(-)

-----------------------------------------------------------------------
diff --git a/src/bin/zonemgr/zonemgr.py.in b/src/bin/zonemgr/zonemgr.py.in
index 4278cfd..dd106b9 100755
--- a/src/bin/zonemgr/zonemgr.py.in
+++ b/src/bin/zonemgr/zonemgr.py.in
@@ -417,19 +417,33 @@ class ZonemgrRefresh:
 
         # store the values so we can restore them if there is a problem
         lowerbound_refresh_backup = self._lowerbound_refresh
-        self._lowerbound_refresh = new_config.get('lowerbound_refresh') or self._lowerbound_refresh
+        # Get a new value, but only if it is defined
+        # We don't use "value or default", because if value would be
+        # 0, we would take default
+        def val_or_default(value, default):
+            if value is not None:
+                return value
+            else:
+                return default
+
+        self._lowerbound_refresh = val_or_default(
+            new_config.get('lowerbound_refresh'), self._lowerbound_refresh)
 
         lowerbound_retry_backup = self._lowerbound_retry
-        self._lowerbound_retry = new_config.get('lowerbound_retry') or self._lowerbound_retry
+        self._lowerbound_retry = val_or_default(
+            new_config.get('lowerbound_retry'), self._lowerbound_retry)
 
         max_transfer_timeout_backup = self._max_transfer_timeout
-        self._max_transfer_timeout = new_config.get('max_transfer_timeout') or self._max_transfer_timeout
+        self._max_transfer_timeout = val_or_default(
+            new_config.get('max_transfer_timeout'), self._max_transfer_timeout)
 
         refresh_jitter_backup = self._refresh_jitter
-        self._refresh_jitter = new_config.get('refresh_jitter') or self._refresh_jitter
+        self._refresh_jitter = val_or_default(
+            new_config.get('refresh_jitter'), self._refresh_jitter)
 
         reload_jitter_backup = self._reload_jitter
-        self._reload_jitter = new_config.get('reload_jitter') or self._reload_jitter
+        self._reload_jitter = val_or_default(
+            new_config.get('reload_jitter'), self._reload_jitter)
         try:
             required = {}
             secondary_zones = new_config.get('secondary_zones')




More information about the bind10-changes mailing list