This patch adds pkg_dir option in COMMON section in global_config.ini that, when set, would be assign to pkgdir attribute of the base_job class.
Signed-off-by: Lucas Meneghel Rodrigues <[email protected]> --- client/shared/base_job.py | 10 +++++++++- global_config.ini | 2 ++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/client/shared/base_job.py b/client/shared/base_job.py index 1ebf72b..11397a9 100644 --- a/client/shared/base_job.py +++ b/client/shared/base_job.py @@ -1026,7 +1026,6 @@ class base_job(object): self._bindir = readonly_dir(self.clientdir) self._configdir = readonly_dir(self.clientdir, 'config') self._profdir = readonly_dir(self.clientdir, 'profilers') - self._pkgdir = readwrite_dir(self.clientdir, 'packages') self._toolsdir = readonly_dir(self.clientdir, 'tools') tmpdir_config = GLOBAL_CONFIG.get_config_value('COMMON', @@ -1042,6 +1041,15 @@ class base_job(object): self._tmpdir = readwrite_dir(tmpdir_config) else: self._tmpdir = readwrite_dir(root, 'tmp') + + pkgdir_config = GLOBAL_CONFIG.get_config_value('COMMON', + 'pkg_dir', + default="") + if pkgdir_config: + self._pkgdir = readwrite_dir(pkgdir_config) + else: + self._pkgdir = readwrite_dir(self.clientdir, 'packages') + self._testdir = readwrite_dir(root, 'tests') self._site_testdir = readwrite_dir(root, 'site_tests') diff --git a/global_config.ini b/global_config.ini index e2d31b8..0736f62 100644 --- a/global_config.ini +++ b/global_config.ini @@ -51,6 +51,8 @@ autotest_top_path: /usr/local/autotest test_tmp_dir: # The path for tests bin/src directory test_src_dir: +# The path for client/server packages directory +pkg_dir: [AUTOSERV] # Autotest potential install paths -- 1.7.10 _______________________________________________ Autotest mailing list [email protected] http://test.kernel.org/cgi-bin/mailman/listinfo/autotest
