All the config path manipulation in kernel_config relies
in comparisons like:
if orig_file == ''
running_config() may return None, that might in turn,
sneak into the lower level functions generating an
error. So let's play safe and pass '' in case the
result of running_config is None.
Signed-off-by: Lucas Meneghel Rodrigues <l...@redhat.com>
---
client/kernel_config.py | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/client/kernel_config.py b/client/kernel_config.py
index 21d9524..20b6fb9 100644
--- a/client/kernel_config.py
+++ b/client/kernel_config.py
@@ -70,7 +70,10 @@ class kernel_config(object):
self.build_dir = build_dir
self.config_dir = config_dir
self.orig_config = os.path.join(config_dir, 'config.orig')
- self.running_config = utils.running_config()
+ running_config = utils.running_config()
+ if running_config is None:
+ running_config = ''
+ self.running_config = running_config
# 1. Get original config file
self.build_config = os.path.join(build_dir, '.config')
@@ -84,7 +87,7 @@ class kernel_config(object):
if defconf:
orig_file = defconf
else:
- if self.running_config is not None:
+ if self.running_config:
orig_file = self.running_config
if (orig_file == '' and not make and defconfig): # use defconfig
make = 'defconfig'
--
1.7.10.2
_______________________________________________
Autotest mailing list
Autotest@test.kernel.org
http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
