diff options
Diffstat (limited to 'configuration.py')
| -rw-r--r-- | configuration.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/configuration.py b/configuration.py index b555529..271afcc 100644 --- a/configuration.py +++ b/configuration.py @@ -878,9 +878,8 @@ def merge_options(options): for i in range(len(options)-1, -1, -1): optname, optdict = options[i] if optname in alloptions: - options.pop(alloptions[optname][1]) - alloptions[optname][0].update(optdict) - alloptions[optname][1] = i + options.pop(i) + alloptions[optname].update(optdict) else: - alloptions[optname] = [optdict, i] + alloptions[optname] = optdict return tuple(options) |