From c047a98137cab13f0051c0678ef3e8ca41e14540 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 7 Jan 2011 17:15:42 +0100
Subject: [PATCH] utils: Move to separate module

This is preparing for splitting the whole units module.

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
 Makefile.am                         | 7 ++++++-
 lib/{utils.py => utils/__init__.py} | 0
 2 files changed, 6 insertions(+), 1 deletion(-)
 rename lib/{utils.py => utils/__init__.py} (100%)

diff --git a/Makefile.am b/Makefile.am
index 612a98a5e..41852078b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,6 +26,7 @@ rapidir = $(pkgpythondir)/rapi
 serverdir = $(pkgpythondir)/server
 watcherdir = $(pkgpythondir)/watcher
 impexpddir = $(pkgpythondir)/impexpd
+utilsdir = $(pkgpythondir)/utils
 toolsdir = $(pkglibdir)/tools
 docdir = $(datadir)/doc/$(PACKAGE)
 
@@ -50,6 +51,7 @@ DIRS = \
 	lib/masterd \
 	lib/rapi \
 	lib/server \
+	lib/utils \
 	lib/watcher \
 	man \
 	qa \
@@ -149,7 +151,6 @@ pkgpython_PYTHON = \
 	lib/ssconf.py \
 	lib/ssh.py \
 	lib/storage.py \
-	lib/utils.py \
 	lib/uidpool.py \
 	lib/workerpool.py
 
@@ -210,6 +211,9 @@ server_PYTHON = \
 	lib/server/noded.py \
 	lib/server/rapi.py
 
+utils_PYTHON = \
+	lib/utils/__init__.py
+
 docrst = \
 	doc/admin.rst \
 	doc/design-2.0.rst \
@@ -514,6 +518,7 @@ all_python_code = \
 	$(confd_PYTHON) \
 	$(masterd_PYTHON) \
 	$(impexpd_PYTHON) \
+	$(utils_PYTHON) \
 	$(watcher_PYTHON) \
 	$(noinst_PYTHON) \
 	$(qa_scripts)
diff --git a/lib/utils.py b/lib/utils/__init__.py
similarity index 100%
rename from lib/utils.py
rename to lib/utils/__init__.py
-- 
GitLab