user options override presets, not the other way around.

dyndnsc/conf.py

@@ -60,7 +60,8 @@ def _iraw_client_configs(cfg):
         if cfg.has_option(client_name, _use_preset):
             prf = dict(
                 cfg.items(_preset_prefix + cfg.get(client_name, _use_preset)))
-            client_cfg_dict.update(prf)
+            prf.update(client_cfg_dict)
+            client_cfg_dict = prf
         else:
             # raw config with NO preset in use, so no updating of dict
             pass

dyndnsc/tests/test_conf.py

@@ -43,6 +43,8 @@ def test_collect_configuration(self):
 use_preset = testpreset
 updater-userid = bob
 updater-password = XYZ
+# test overwriting a preset value:
+detector-url = http://myip.example.com/
 
 [preset:testpreset]
 updater = fubarUpdater
@@ -61,6 +63,9 @@ def test_collect_configuration(self):
         self.assertTrue('detector' in config['testconfig'])
         self.assertTrue(isinstance(config['testconfig']['detector'], list))
         self.assertEqual(1, len(config['testconfig']['detector']))
+        detector, detector_opts = config['testconfig']['detector'][-1]
+        self.assertEqual(detector, "webcheck4")  # from the preset
+        self.assertEqual(detector_opts['url'], "http://myip.example.com/")  # from the user conf
         self.assertTrue('updater' in config['testconfig'])
         self.assertTrue(isinstance(config['testconfig']['updater'], list))
         self.assertEqual(1, len(config['testconfig']['updater']))