[reprotest] 01/01: Fix the reading of config options

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch master
in repository reprotest.

commit 2a0cb815c09b2470c117fc6a9d6f70b49dbbbf03
Author: Ximin Luo <infinity0 at debian.org>
Date:   Tue Jan 24 16:43:50 2017 +0100

    Fix the reading of config options
    
    - build_command is a string now
    - don't error if certain config keys are not set
---
 reprotest/__init__.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/reprotest/__init__.py b/reprotest/__init__.py
index 8843b67..0918aa5 100644
--- a/reprotest/__init__.py
+++ b/reprotest/__init__.py
@@ -580,8 +580,7 @@ COMMAND_LINE_OPTIONS = types.MappingProxyType(collections.OrderedDict([
                 'implemented very well and may leave cruft on your system.'})),
     ]))
 
-MULTIPLET_OPTIONS = frozenset(['build_command', 'dont_vary',
-                               'variations', 'virtual_server_args'])
+MULTIPLET_OPTIONS = frozenset(['dont_vary', 'variations', 'virtual_server_args'])
 
 CONFIG_OPTIONS = []
 for option in COMMAND_LINE_OPTIONS.keys():
@@ -598,10 +597,11 @@ def config():
     options = collections.OrderedDict()
     if 'basics' in config:
         for option in CONFIG_OPTIONS:
-            if option in config['basics'] and option in MULTIPLET_OPTIONS:
-                options[option] = config['basics'][option].split()
-            else:
-                options[option] = config['basics'][option]
+            if option in config['basics']:
+                if option in MULTIPLET_OPTIONS:
+                    options[option] = config['basics'][option].split()
+                else:
+                    options[option] = config['basics'][option]
     return types.MappingProxyType(options)
 
 def command_line(*argv):

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/reprotest.git