The kernelexpand method sometimes returns a list, and sometimes
returns a string. Since the code that calls it currently assumes it
will always return a list, we need to either fix that caller to look
at the return type (messy) or always return a list (which is what this
change does).
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@1320 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/kernel.py b/client/bin/kernel.py
index 4ce5193..2aeb4a8 100755
--- a/client/bin/kernel.py
+++ b/client/bin/kernel.py
@@ -111,8 +111,8 @@
def kernelexpand(self, kernel):
# If we have something like a path, just use it as it is
- if kernel.find('/') >= 0:
- return kernel
+ if '/' in kernel:
+ return [kernel]
# Find the configured mirror list.
mirrors = self.job.config_get('mirror.mirrors')