Pulls the kernel/rpm_kernel autoselection code out of job.py and into a helper
function in kernel.py, and move the site-specific hook that allows
pre-processing of kernel paths out of rpm_kernel and into this new helper
function.
Signed-off-by: John Admanski <jadmanski@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@939 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/bin/job.py b/client/bin/job.py
index d7b2bba..c7e777b 100755
--- a/client/bin/job.py
+++ b/client/bin/job.py
@@ -179,10 +179,9 @@
def kernel(self, base_tree, results_dir = '', tmp_dir = '', leave = False):
"""Summon a kernel object"""
(results_dir, tmp_dir) = self.setup_dirs(results_dir, tmp_dir)
- if base_tree.endswith('.rpm'):
- return kernel.rpm_kernel(self, base_tree, results_dir)
build_dir = 'linux'
- return kernel.kernel(self, base_tree, results_dir, tmp_dir, build_dir, leave)
+ return kernel.auto_kernel(self, base_tree, results_dir,
+ tmp_dir, build_dir, leave)
def barrier(self, *args):