Author: glen Date: Mon Apr 6 16:53:24 2009 GMT Module: pld-builder.new Tag: HEAD ---- Log message: - need email being setup as early as possible as it is used in exception handler
---- Files affected: pld-builder.new/PLD_Builder: config.py (1.40 -> 1.41) ---- Diffs: ================================================================ Index: pld-builder.new/PLD_Builder/config.py diff -u pld-builder.new/PLD_Builder/config.py:1.40 pld-builder.new/PLD_Builder/config.py:1.41 --- pld-builder.new/PLD_Builder/config.py:1.40 Wed Mar 4 09:12:48 2009 +++ pld-builder.new/PLD_Builder/config.py Mon Apr 6 18:53:19 2009 @@ -49,6 +49,9 @@ p.readfp(open(path.builder_conf)) + self.admin_email = get("admin_email") + self.email = self.admin_email + if p.has_option("all", "syslog"): f = p.get("all", "syslog") if f != "": @@ -65,11 +68,9 @@ self.src_builder = string.strip(get("src_builder", "")) self.tag_prefixes = string.split(get("tag_prefixes", "")) self.max_keep_time = int(get("max_keep_time", 168))*60*60 - self.max_jobs = int(get("max_jobs")) self.bot_email = get("bot_email", "") self.control_url = get("control_url") self.request_handler_server_port = int(get("request_handler_server_port", 1234)) - self.admin_email = get("admin_email") self.builder_list = get("builder_list", "") self.gen_upinfo = get("gen_upinfo", "yes") if self.gen_upinfo == 'no': @@ -78,16 +79,16 @@ self.gen_upinfo = True status.admin = self.admin_email status.builder_list = self.builder_list - self.email = self.admin_email + self.max_jobs = int(get("max_jobs")) if builder == "all": return + self.email = get("email") if builder not in p.sections(): log.panic("builder %s not in config file" % builder) self.arch = get("arch") self.chroot = get("chroot") - self.email = get("email") self.buildlogs_url = get("buildlogs_url", "/dev/null") self.ftp_url = get("ftp_url") self.notify_url = get("notify_url") ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/pld-builder.new/PLD_Builder/config.py?r1=1.40&r2=1.41&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit