Do not overwrite the per kernel config_file value if it has been
provided by the RPC user.
Signed-off-by: Mihai Rusu <dizzy@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@3919 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/frontend/afe/control_file.py b/frontend/afe/control_file.py
index 4fc560f..ae3d425 100644
--- a/frontend/afe/control_file.py
+++ b/frontend/afe/control_file.py
@@ -128,8 +128,13 @@
# add 'config_file' keys to the kernel_info dictionaries
new_kernel_list = []
for kernel_info in kernel_list:
- config_file = kernel_config_file(kernel_info['version'], platform)
- new_kernel_info = dict(kernel_info, config_file=config_file)
+ if kernel_info.get('config_file'):
+ # already got a config file from the user
+ new_kernel_info = kernel_info
+ else:
+ config_file = kernel_config_file(kernel_info['version'], platform)
+ new_kernel_info = dict(kernel_info, config_file=config_file)
+
new_kernel_list.append(new_kernel_info)
if is_server: