[GNUnet-SVN] r23219 - gnunet-planetlab/gplmt/scripts

[gnunet]

Author: wachs
Date: 2012-08-14 12:03:52 +0200 (Tue, 14 Aug 2012)
New Revision: 23219

Modified:
   gnunet-planetlab/gplmt/scripts/create_buildbot_configuration.py
Log:
- mod


Modified: gnunet-planetlab/gplmt/scripts/create_buildbot_configuration.py
===================================================================
--- gnunet-planetlab/gplmt/scripts/create_buildbot_configuration.py     
2012-08-14 09:41:20 UTC (rev 23218)
+++ gnunet-planetlab/gplmt/scripts/create_buildbot_configuration.py     
2012-08-14 10:03:52 UTC (rev 23219)
@@ -11,6 +11,7 @@
   -s, --slice=     Planetlab slice\n\
   -f, --file=      file containing nodes\n\
   -c, --cmd_file=  command file for gplmt\n\
+  -t, --template=  buildmaster configuration template\n\
   -m, --master=    buildbot server\n\
   -h, --help       print this help\n\
 Report bugs to address@hidden \n\
@@ -23,11 +24,12 @@
 plslice = None
 filename = None
 master = None
+template = None
 out_cmd_file = "cmdfile"
 buildslave_cmd = "buildslave create-slave ./bot "
 
 try:
-    opts, args = getopt.getopt(sys.argv[1:], "hu:p:s:f:c:m:", ["help", 
"user=", "password=", "slice=", "file=", "cmd_file", "master"])
+    opts, args = getopt.getopt(sys.argv[1:], "hu:p:s:f:c:m:t:", ["help", 
"user=", "password=", "slice=", "file=", "cmd_file", "master", "template"])
 except getopt.GetoptError, err:
     # print help information and exit:
     print str(err) # will print something like "option -a not recognized"
@@ -48,7 +50,9 @@
     elif o in ("-c", "--cmd_file"):
         out_cmd_file = a
     elif o in ("-m", "--master"):
-        master = a     
+        master = a
+    elif o in ("-t", "--template"):
+        template = a              
     else:
         assert False, "unhandled option"
 
@@ -58,9 +62,15 @@
     sys.exit(2)
     
 if (master == None):
+    print "No buildmaster server given!"
     usage()
     sys.exit(2)    
 
+if (template == None):
+    print "No buildbot configuration template given!"
+    usage()
+    sys.exit(2)
+        
 # PlanetLab Europe
 api_url = "https://www.planet-lab.eu/PLCAPI/";
 # Planetlab Central