reading None types should not emit into the path or target components when reconfiguring

Author: phausler

configure

@@ -48,59 +48,59 @@ def reconfigure(config, path):
     with open(path, 'r') as infile:
         info = json.load(infile)
         if 'version' in info and info['version'] == config.version:
-            if 'command' in info:
+            if 'command' in info and info['command'] is not None:
                 config.command = info['command']
-            if 'project' in info:
+            if 'project' in info and info['project'] is not None:
                 config.command = info['project']
-            if 'script_path' in info:
+            if 'script_path' in info and info['script_path'] is not None:
                 config.script_path = Path(info['script_path'])
-            if 'build_script_path' in info:
+            if 'build_script_path' in info and info['build_script_path'] is not None:
                 config.build_script_path = Path(info['build_script_path'])
-            if 'source_root' in info:
+            if 'source_root' in info and info['source_root'] is not None:
                 config.source_root = Path(info['source_root'])
-            if 'target' in info:
+            if 'target' in info and info['target'] is not None:
                 config.target = Target(info['target'])
-            if 'system_root' in info:
+            if 'system_root' in info and info['system_root'] is not None:
                 config.system_root = Path(info['system_root'])
-            if 'toolchain' in info:
+            if 'toolchain' in info and info['toolchain'] is not None:
                 config.toolchain = info['toolchain']
-            if 'build_directory' in info:
+            if 'build_directory' in info and info['build_directory'] is not None:
                 config.build_directory = Path(info['build_directory'])
-            if 'intermediate_directory' in info:
+            if 'intermediate_directory' in info and info['intermediate_directory'] is not None:
                 config.intermediate_directory = Path(info['intermediate_directory'])
-            if 'module_cache_directory' in info:
+            if 'module_cache_directory' in info and info['module_cache_directory'] is not None:
                 config.module_cache_directory = Path(info['module_cache_directory'])
-            if 'install_directory' in info:
+            if 'install_directory' in info and info['install_directory'] is not None:
                 config.install_directory = Path(info['install_directory'])
-            if 'prefix' in info:
+            if 'prefix' in info and info['prefix'] is not None:
                 config.prefix = info['prefix']
-            if 'swift_install' in info:
+            if 'swift_install' in info and info['swift_install'] is not None:
                 config.swift_install = info['swift_install']
-            if 'clang' in info:
+            if 'clang' in info and info['clang'] is not None:
                 config.clang = info['clang']
-            if 'clangxx' in info:
+            if 'clangxx' in info and info['clangxx'] is not None:
                 config.clangxx = info['clangxx']
-            if 'swift' in info:
+            if 'swift' in info and info['swift'] is not None:
                 config.swift = info['swift']
-            if 'swiftc' in info:
+            if 'swiftc' in info and info['swiftc'] is not None:
                 config.swiftc = info['swiftc']
-            if 'ar' in info:
+            if 'ar' in info and info['ar'] is not None:
                 config.ar = info['ar']
-            if 'swift_sdk' in info:
+            if 'swift_sdk' in info and info['swift_sdk'] is not None:
                 config.swift_sdk = info['swift_sdk']
-            if 'bootstrap_directory' in info:
+            if 'bootstrap_directory' in info and info['bootstrap_directory'] is not None:
                 config.bootstrap_directory = Path(info['bootstrap_directory'])
-            if 'verbose' in info:
+            if 'verbose' in info and info['verbose'] is not None:
                 config.verbose = info['verbose']
-            if 'extra_c_flags' in info:
+            if 'extra_c_flags' in info and info['extra_c_flags'] is not None:
                 config.extra_c_flags = info['extra_c_flags']
-            if 'extra_swift_flags' in info:
+            if 'extra_swift_flags' in info and info['extra_swift_flags'] is not None:
                 config.extra_swift_flags = info['extra_swift_flags']
-            if 'extra_ld_flags' in info:
+            if 'extra_ld_flags' in info and info['extra_ld_flags'] is not None:
                 config.extra_ld_flags = info['extra_ld_flags']
-            if 'build_mode' in info:
+            if 'build_mode' in info and info['build_mode'] is not None:
                 config.build_mode = info['build_mode']
-            if 'variables' in info:
+            if 'variables' in info and info['variables'] is not None:
                 config.variables = info['variables']
         else:
             sys.exit("invalid version")