Move server import only into the upload section as a temporary fix for being able to use packages.py on clients until upload funcationality can be put into a server side package lib
Signed-off-by: Scott Zawalski <scottz@google.com>
git-svn-id: http://test.kernel.org/svn/autotest/trunk@2999 592f7852-d20e-0410-864c-8624ca9c26a4
diff --git a/client/common_lib/packages.py b/client/common_lib/packages.py
index 3f4ba34..73ffd1a 100644
--- a/client/common_lib/packages.py
+++ b/client/common_lib/packages.py
@@ -10,7 +10,6 @@
import re, os, sys, traceback, subprocess, shutil, time, traceback, urlparse
import fcntl, logging
from autotest_lib.client.common_lib import error, utils, global_config
-from autotest_lib.server import subcommand
class PackageUploadError(error.AutotestError):
@@ -189,6 +188,7 @@
'''
Clean up custom upload/download areas
'''
+ from autotest_lib.server import subcommand
if not custom_repos:
custom_repos = global_config.global_config.get_config_value('PACKAGES',
'custom_upload_location').split(',')
@@ -412,6 +412,7 @@
def upload_pkg(self, pkg_path, upload_path=None, update_checksum=False):
+ from autotest_lib.server import subcommand
if upload_path:
upload_path_list = [upload_path]
self.upkeep(upload_path_list)