Move client/bin/kernel_versions to common_lib; it is used by tko.

Signed-off-by: Duane Sand <duanes@google.com>



git-svn-id: svn://test.kernel.org/autotest/trunk@3316 592f7852-d20e-0410-864c-8624ca9c26a4

4 files changed, 6 insertions, 7 deletions

diff --git a/tko/compose_query.cgi b/tko/compose_query.cgi
index 0184c43b..b8bb301d 100755
--- a/tko/compose_query.cgi
+++ b/tko/compose_query.cgi
@@ -14,7 +14,7 @@ total_wall_time_start = time.time()
 
 import common
 from autotest_lib.tko import display, frontend, db, query_lib
-from autotest_lib.client.bin import kernel_versions
+from autotest_lib.client.common_lib import kernel_versions
 
 html_header = """\
 <form action="/tko/compose_query.cgi" method="get">
diff --git a/tko/frontend.py b/tko/frontend.py
index 70ee2fc7..d9aff027 100755
--- a/tko/frontend.py
+++ b/tko/frontend.py
@@ -1,13 +1,12 @@
 #!/usr/bin/python
 import os, re, db, sys, datetime
+import common
+from autotest_lib.client.common_lib import kernel_versions
+
 MAX_RECORDS = 50000L
 MAX_CELLS = 500000L
 
 tko = os.path.dirname(os.path.realpath(os.path.abspath(__file__)))
-client_bin = os.path.abspath(os.path.join(tko, '../client/bin'))
-sys.path.insert(0, client_bin)
-import kernel_versions
-
 root_url_file = os.path.join(tko, '.root_url')
 if os.path.exists(root_url_file):
     html_root = open(root_url_file, 'r').readline().rstrip()
diff --git a/tko/machine_aggr.cgi b/tko/machine_aggr.cgi
index 4d3b97bb..b45dfd1f 100755
--- a/tko/machine_aggr.cgi
+++ b/tko/machine_aggr.cgi
@@ -8,7 +8,7 @@ Popen = subprocess.Popen
 
 import common
 from autotest_lib.tko import db, display, frontend, plotgraph
-from autotest_lib.client.bin import kernel_versions
+from autotest_lib.client.common_lib import kernel_versions
 
 released_kernel = re.compile('2\.\d\.\d+(-smp-)[0-9]{3}\.[0-9]$')
 rc_kernel = re.compile('2\.\d\.\d+(-smp-)[0-9]{3}\.[0-9]_rc[0-9]$')
diff --git a/tko/machine_test_attribute_graph.cgi b/tko/machine_test_attribute_graph.cgi
index e9b39fe0..1f5b8b3a 100755
--- a/tko/machine_test_attribute_graph.cgi
+++ b/tko/machine_test_attribute_graph.cgi
@@ -8,7 +8,7 @@ Popen = subprocess.Popen
 
 import common
 from autotest_lib.tko import db, display, frontend, plotgraph
-from autotest_lib.client.bin import kernel_versions
+from autotest_lib.client.common_lib import kernel_versions
 
 db = db.db()