Move gnt-debug to ganeti.client.gnt_debug

Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>

.gitignore

@@ -65,3 +65,6 @@
 /man/*.[0-9]
 /man/*.html
 /man/*.in
+
+# scripts
+/scripts/gnt-debug

Makefile.am

@@ -138,7 +138,8 @@ pkgpython_PYTHON = \
 	lib/workerpool.py
 
 client_PYTHON = \
-	lib/client/__init__.py
+	lib/client/__init__.py \
+	lib/client/gnt_debug.py
 
 hypervisor_PYTHON = \
 	lib/hypervisor/__init__.py \
@@ -254,7 +255,8 @@ gnt_scripts = \
 	scripts/gnt-node \
 	scripts/gnt-os
 
-PYTHON_BOOTSTRAP =
+PYTHON_BOOTSTRAP = \
+	scripts/gnt-debug
 
 dist_sbin_SCRIPTS = \
 	daemons/ganeti-noded \
@@ -262,7 +264,12 @@ dist_sbin_SCRIPTS = \
 	daemons/ganeti-masterd \
 	daemons/ganeti-confd \
 	daemons/ganeti-rapi \
-	$(gnt_scripts)
+	scripts/gnt-backup \
+	scripts/gnt-cluster \
+	scripts/gnt-instance \
+	scripts/gnt-job \
+	scripts/gnt-node \
+	scripts/gnt-os
 
 nodist_sbin_SCRIPTS = \
 	$(PYTHON_BOOTSTRAP) \

scripts/gnt-debug → lib/client/gnt_debug.py

-#!/usr/bin/python
+#
 #
 
 # Copyright (C) 2006, 2007, 2010 Google Inc.
@@ -25,7 +25,6 @@
 # W0614: Unused import %s from wildcard import (since we need cli)
 # C0103: Invalid name gnt-backup
 
-import sys
 import simplejson
 import time
 import socket
@@ -586,5 +585,5 @@ commands = {
   }
 
 
-if __name__ == '__main__':
-  sys.exit(GenericMain(commands))
+def Main():
+  return GenericMain(commands)