From 909e5cee469ca8f9b45ce52ab4db98641293fc96 Mon Sep 17 00:00:00 2001
From: Anders Ingemann <anders@ingemann.de>
Date: Sun, 30 Nov 2014 14:13:43 +0100
Subject: [PATCH] Put remote module into pkg root

---
 bootstrap-vz-remote                                   | 2 +-
 bootstrap-vz-server                                   | 2 +-
 bootstrapvz/{base => }/remote/__init__.py             | 0
 bootstrapvz/{base => }/remote/callback.py             | 0
 bootstrapvz/{base/remote/remote.py => remote/main.py} | 2 ++
 bootstrapvz/{base => }/remote/server.py               | 0
 bootstrapvz/{base => }/remote/ssh_rpc_manager.py      | 0
 tests/integration/tools/__init__.py                   | 4 ++--
 8 files changed, 6 insertions(+), 4 deletions(-)
 rename bootstrapvz/{base => }/remote/__init__.py (100%)
 rename bootstrapvz/{base => }/remote/callback.py (100%)
 rename bootstrapvz/{base/remote/remote.py => remote/main.py} (97%)
 rename bootstrapvz/{base => }/remote/server.py (100%)
 rename bootstrapvz/{base => }/remote/ssh_rpc_manager.py (100%)

diff --git a/bootstrap-vz-remote b/bootstrap-vz-remote
index b5050b8..d7b7254 100755
--- a/bootstrap-vz-remote
+++ b/bootstrap-vz-remote
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 
 if __name__ == '__main__':
-	from bootstrapvz.base.remote.remote import main
+	from bootstrapvz.remote.main import main
 	main()
diff --git a/bootstrap-vz-server b/bootstrap-vz-server
index a79f005..bf941a0 100755
--- a/bootstrap-vz-server
+++ b/bootstrap-vz-server
@@ -1,5 +1,5 @@
 #!/usr/bin/env python
 
 if __name__ == '__main__':
-	from bootstrapvz.base.remote.server import main
+	from bootstrapvz.remote.server import main
 	main()
diff --git a/bootstrapvz/base/remote/__init__.py b/bootstrapvz/remote/__init__.py
similarity index 100%
rename from bootstrapvz/base/remote/__init__.py
rename to bootstrapvz/remote/__init__.py
diff --git a/bootstrapvz/base/remote/callback.py b/bootstrapvz/remote/callback.py
similarity index 100%
rename from bootstrapvz/base/remote/callback.py
rename to bootstrapvz/remote/callback.py
diff --git a/bootstrapvz/base/remote/remote.py b/bootstrapvz/remote/main.py
similarity index 97%
rename from bootstrapvz/base/remote/remote.py
rename to bootstrapvz/remote/main.py
index 6dc9a37..aa0d719 100644
--- a/bootstrapvz/base/remote/remote.py
+++ b/bootstrapvz/remote/main.py
@@ -46,6 +46,8 @@ Options:
                      If <path> is `-' file logging will be disabled.
   --pause-on-error   Pause on error, before rollback
   --dry-run          Don't actually run the tasks
+  --color=auto|always|never
+                     Colorize the console output [default: auto]
   --debug            Print debugging information
   -h, --help         show this help
 	"""
diff --git a/bootstrapvz/base/remote/server.py b/bootstrapvz/remote/server.py
similarity index 100%
rename from bootstrapvz/base/remote/server.py
rename to bootstrapvz/remote/server.py
diff --git a/bootstrapvz/base/remote/ssh_rpc_manager.py b/bootstrapvz/remote/ssh_rpc_manager.py
similarity index 100%
rename from bootstrapvz/base/remote/ssh_rpc_manager.py
rename to bootstrapvz/remote/ssh_rpc_manager.py
diff --git a/tests/integration/tools/__init__.py b/tests/integration/tools/__init__.py
index 2ca8b8c..11efa2d 100644
--- a/tests/integration/tools/__init__.py
+++ b/tests/integration/tools/__init__.py
@@ -4,7 +4,7 @@ from build_servers import RemoteBuildServer
 
 # Register deserialization handlers for objects
 # that will pass between server and client
-from bootstrapvz.base.remote import register_deserialization_handlers
+from bootstrapvz.remote import register_deserialization_handlers
 register_deserialization_handlers()
 
 
@@ -47,7 +47,7 @@ def bootstrap(manifest, build_server):
 		from bootstrapvz.base.main import run
 		bootstrap_info = run(manifest)
 	else:
-		from bootstrapvz.base.remote.remote import run
+		from bootstrapvz.remote.main import run
 		bootstrap_info = run(manifest, build_server.settings)
 	return bootstrap_info