From ff9efc0370374a9b3005eab434a5483b8c07c5b9 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 4 Dec 2008 15:22:41 +0000
Subject: [PATCH] Move HTTP code to subpackage
This is a preparation step for splitting the HTTP client and server code
into two separate modules.
Reviewed-by: amishchenko
---
Makefile.am | 10 ++++++++--
lib/{http.py => http/__init__.py} | 0
2 files changed, 8 insertions(+), 2 deletions(-)
rename lib/{http.py => http/__init__.py} (100%)
diff --git a/Makefile.am b/Makefile.am
index e5a3047ca..9483ed586 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,6 +15,7 @@ BUILD_RAPI_RESOURCE_DOC = $(top_srcdir)/doc/build-rapi-resources-doc
REPLACE_VARS_SED = autotools/replace_vars.sed
hypervisordir = $(pkgpythondir)/hypervisor
+httpdir = $(pkgpythondir)/http
rapidir = $(pkgpythondir)/rapi
toolsdir = $(pkglibdir)/tools
docdir = $(datadir)/doc/$(PACKAGE)
@@ -26,6 +27,7 @@ DIRS = \
doc \
doc/examples \
lib \
+ lib/http \
lib/hypervisor \
lib/rapi \
man \
@@ -46,6 +48,7 @@ CLEANFILES = \
doc/examples/ganeti.initd \
doc/examples/ganeti.cron \
lib/*.py[co] \
+ lib/http/*.py[co] \
lib/hypervisor/*.py[co] \
lib/rapi/*.py[co] \
man/*.[78] \
@@ -69,7 +72,6 @@ pkgpython_PYTHON = \
lib/constants.py \
lib/daemon.py \
lib/errors.py \
- lib/http.py \
lib/jqueue.py \
lib/jstore.py \
lib/locking.py \
@@ -98,6 +100,9 @@ rapi_PYTHON = \
lib/rapi/rlib1.py \
lib/rapi/rlib2.py
+http_PYTHON = \
+ lib/http/__init__.py
+
docsgml = \
doc/hooks.sgml \
@@ -301,7 +306,8 @@ $(REPLACE_VARS_SED): Makefile stamp-directories
#.PHONY: srclinks
srclinks: stamp-directories
set -e; \
- for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) $(rapi_PYTHON); do \
+ for i in man/footer.sgml $(pkgpython_PYTHON) $(hypervisor_PYTHON) \
+ $(rapi_PYTHON) $(http_PYTHON); do \
if test ! -f $$i -a -f $(abs_top_srcdir)/$$i; then \
$(LN_S) $(abs_top_srcdir)/$$i $$i; \
fi; \
diff --git a/lib/http.py b/lib/http/__init__.py
similarity index 100%
rename from lib/http.py
rename to lib/http/__init__.py
--
GitLab