[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r25742 - gnunet-planetlab/gplmt/gplmt
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r25742 - gnunet-planetlab/gplmt/gplmt |
|
Date: |
Thu, 10 Jan 2013 13:17:07 +0100 |
Author: wachs
Date: 2013-01-10 13:17:06 +0100 (Thu, 10 Jan 2013)
New Revision: 25742
Modified:
gnunet-planetlab/gplmt/gplmt/Configuration.py
Log:
catch no section
Modified: gnunet-planetlab/gplmt/gplmt/Configuration.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Configuration.py 2013-01-10 11:54:16 UTC
(rev 25741)
+++ gnunet-planetlab/gplmt/gplmt/Configuration.py 2013-01-10 12:17:06 UTC
(rev 25742)
@@ -54,6 +54,9 @@
self.ssh_password = ""
self.ssh_use_known_hosts = False
self.ssh_transfer = TransferMode.scp
+ self.bb_template = ""
+ self.bb_task_file = ""
+ self.bb_result_cfg = ""
def load (self):
if (None == self.filename):
default_cfg = os.path.expanduser("~") + os.sep + ".gplmt" +
os.sep+ "gplmt.conf"
@@ -75,72 +78,99 @@
return False
# required values
- try:
- self.pl_slicename = config.get("planetlab", "slice")
- except ConfigParser.NoOptionError as e:
- print "Error parsing configuration: " + str (e)
- return False
- # optional values
try:
- self.pl_use_nodes = config.getboolean ("planetlab", "use_pl_nodes")
- except ConfigParser.NoOptionError as e:
- pass
+ try:
+ self.pl_slicename = config.get("planetlab", "slice")
+ except ConfigParser.NoOptionError as e:
+ print "Error parsing configuration: " + str (e)
+ return False
+ # optional values
+ try:
+ self.pl_use_nodes = config.getboolean ("planetlab",
"use_pl_nodes")
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ self.pl_api_url = config.get("planetlab", "api_url")
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ self.pl_username = config.get("planetlab", "username")
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ self.pl_password = config.get("planetlab", "password")
+ except ConfigParser.NoOptionError as e:
+ pass
+ except ConfigParser.NoSectionError:
+ pass
+
+ try:
+ try:
+ # gplmt options
+ self.taskfile = config.get("gplmt", "tasks")
+ except ConfigParser.NoOptionError as e:
+ pass
+
+ try:
+ self.nodesfile = config.get("gplmt", "nodes")
+ except ConfigParser.NoOptionError as e:
+ pass
+
+ try:
+ self.notifications = config.get("gplmt", "notification")
+ except ConfigParser.NoOptionError as e:
+ pass
+ except ConfigParser.NoSectionError:
+ pass
+
+ # buildbot options
try:
- self.pl_api_url = config.get("planetlab", "api_url")
- except ConfigParser.NoOptionError as e:
- pass
- try:
- self.pl_username = config.get("planetlab", "username")
- except ConfigParser.NoOptionError as e:
- pass
- try:
- self.pl_password = config.get("planetlab", "password")
- except ConfigParser.NoOptionError as e:
- pass
- try:
- # gplmt options
- self.taskfile = config.get("gplmt", "tasks")
- except ConfigParser.NoOptionError as e:
- pass
+ try:
+ self.bb_template = config.get("buildbot", "template")
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ self.bb_result_task_file = config.get("buildbot",
"result_task_file")
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ self.bb_result_cfg = config.get("buildbot", "result_cfg")
+ except ConfigParser.NoOptionError as e:
+ pass
+ except ConfigParser.NoSectionError:
+ pass
- try:
- self.nodesfile = config.get("gplmt", "nodes")
- except ConfigParser.NoOptionError as e:
- pass
-
- try:
- self.notifications = config.get("gplmt", "notification")
- except ConfigParser.NoOptionError as e:
- pass
-
# ssh options
- try:
- self.ssh_add_unkown_hostkeys = config.getboolean ("ssh",
"add_unkown_hostkeys")
- except ConfigParser.NoOptionError as e:
- pass
- try:
- self.ssh_use_known_hosts = config.getboolean ("ssh",
"ssh_use_known_hosts")
- except ConfigParser.NoOptionError as e:
- pass
- try:
- self.ssh_keyfile = config.get("ssh", "ssh_keyfile")
- except ConfigParser.NoOptionError as e:
- pass
- try:
- self.ssh_password = config.get("ssh", "ssh_password")
- except ConfigParser.NoOptionError as e:
- pass
- try:
- transfer = config.get("ssh", "ssh_transfer")
- if (transfer == "scp"):
- self.ssh_transfer = TransferMode.scp
- elif (transfer == "sftp"):
- self.ssh_transfer = TransferMode.sftp
- else:
- print "Invalid ssh transfer mode: only SFTP or SCP are
supported"
- return False
- except ConfigParser.NoOptionError as e:
- pass
+ try:
+ try:
+ self.ssh_add_unkown_hostkeys = config.getboolean ("ssh",
"add_unkown_hostkeys")
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ self.ssh_use_known_hosts = config.getboolean ("ssh",
"ssh_use_known_hosts")
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ self.ssh_keyfile = config.get("ssh", "ssh_keyfile")
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ self.ssh_password = config.get("ssh", "ssh_password")
+ except ConfigParser.NoOptionError as e:
+ pass
+ try:
+ transfer = config.get("ssh", "ssh_transfer")
+ if (transfer == "scp"):
+ self.ssh_transfer = TransferMode.scp
+ elif (transfer == "sftp"):
+ self.ssh_transfer = TransferMode.sftp
+ else:
+ print "Invalid ssh transfer mode: only SFTP or SCP are
supported"
+ return False
+ except ConfigParser.NoOptionError as e:
+ pass
+ except ConfigParser.NoSectionError:
+ pass
return True
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r25742 - gnunet-planetlab/gplmt/gplmt,
gnunet <=