From 1da489e28bf73ff42538216d240b3598984f7882 Mon Sep 17 00:00:00 2001 From: Guido Trotter Date: Fri, 10 May 2013 18:12:55 +0200 Subject: [PATCH] Move cmdlib.py to cmdlib/__init__.py cmdlib.py has grown *really* too much. Move it into its own package to allow splitting it further. Signed-off-by: Guido Trotter Signed-off-by: Thomas Thrainer Reviewed-by: Klaus Aehlig --- Makefile.am | 7 ++++++- lib/{cmdlib.py => cmdlib/__init__.py} | 0 2 files changed, 6 insertions(+), 1 deletion(-) rename lib/{cmdlib.py => cmdlib/__init__.py} (100%) diff --git a/Makefile.am b/Makefile.am index d7cc0b7..4a68bdc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,7 @@ SHELL_ENV_INIT = autotools/shell-env-init # Note: these are automake-specific variables, and must be named after # the directory + 'dir' suffix clientdir = $(pkgpythondir)/client +cmdlibdir = $(pkgpythondir)/cmdlib hypervisordir = $(pkgpythondir)/hypervisor httpdir = $(pkgpythondir)/http masterddir = $(pkgpythondir)/masterd @@ -105,6 +106,7 @@ DIRS = \ lib \ lib/build \ lib/client \ + lib/cmdlib \ lib/confd \ lib/http \ lib/hypervisor \ @@ -260,7 +262,6 @@ pkgpython_PYTHON = \ lib/bdev.py \ lib/bootstrap.py \ lib/cli.py \ - lib/cmdlib.py \ lib/compat.py \ lib/config.py \ lib/constants.py \ @@ -306,6 +307,9 @@ client_PYTHON = \ lib/client/gnt_os.py \ lib/client/gnt_storage.py +cmdlib_PYTHON = \ + lib/cmdlib/__init__.py + hypervisor_PYTHON = \ lib/hypervisor/__init__.py \ lib/hypervisor/hv_base.py \ @@ -1240,6 +1244,7 @@ all_python_code = \ $(python_tests) \ $(pkgpython_PYTHON) \ $(client_PYTHON) \ + $(cmdlib_PYTHON) \ $(hypervisor_PYTHON) \ $(rapi_PYTHON) \ $(server_PYTHON) \ diff --git a/lib/cmdlib.py b/lib/cmdlib/__init__.py similarity index 100% rename from lib/cmdlib.py rename to lib/cmdlib/__init__.py -- 1.7.10.4