- minor changes

Changed files:
    PLD_Builder/config.py -> 1.26
    PLD_Builder/file_sender.py -> 1.15
    PLD_Builder/load_balancer.py -> 1.10
    PLD_Builder/request_fetcher.py -> 1.18

diff --git a/PLD_Builder/config.py b/PLD_Builder/config.py
index 4a68aa118f1b04be0223be1173174439b0570a66..3c75307424c84ce1c7270222cb6abf9c6c340003 100644 (file)
--- a/PLD_Builder/config.py
+++ b/PLD_Builder/config.py
@@ -62,6 +62,7 @@ class Builder_Conf:
         self.builder = builder
 
         self.binary_builders = string.split(get("binary_builders"))
+        self.src_builder = string.strip(get("src_builder", ""))
         self.tag_prefixes = string.split(get("tag_prefixes", ""))
         self.bot_email = get("bot_email", "")
         self.control_url = get("control_url")
@@ -100,11 +101,12 @@ class Builder_Conf:
 
 config = Builder_Conf()
 
-def init_conf(builder):
+def init_conf(builder=None):
     os.environ['LC_ALL'] = "C"
     status.push("reading builder config")
     log.builder = builder
-    if builder == "": builder = "all"
+    if not builder:
+        builder = "all"
     config.read(builder)
     log.builder = config.builder
     status.pop()

diff --git a/PLD_Builder/file_sender.py b/PLD_Builder/file_sender.py
index ade1693c1c80d23d95b9c41f4764e58ee516132c..f9261c905105eb7ccf34cdec55590360364af6ab 100644 (file)
--- a/PLD_Builder/file_sender.py
+++ b/PLD_Builder/file_sender.py
@@ -167,7 +167,7 @@ problem = ""
 def main():
     if lock.lock("sending-files", non_block = 1) == None:
         return
-    init_conf("")
+    init_conf()
     maybe_flush_queue(path.buildlogs_queue_dir)
     maybe_flush_queue(path.ftp_queue_dir)
 

diff --git a/PLD_Builder/load_balancer.py b/PLD_Builder/load_balancer.py
index 34f4b0bd4c6aa9b960e8038709918d68e53bbe1c..1dd7e04622737cf3d0fa12b14dc0d620005a2149 100644 (file)
--- a/PLD_Builder/load_balancer.py
+++ b/PLD_Builder/load_balancer.py
@@ -58,7 +58,7 @@ def run_rpm_builder(b):
         sys.exit(0)
 
 def main():
-    init_conf("")
+    init_conf()
     for b in builders_order():
         run_rpm_builder(b)
         # give builder some time to aquire lock

diff --git a/PLD_Builder/request_fetcher.py b/PLD_Builder/request_fetcher.py
index 13d3ecdf7dec4b7b1d4e7e42e6acc98c5c979464..f56051624a44e96faf713e210e5e57a22d674074 100644 (file)
--- a/PLD_Builder/request_fetcher.py
+++ b/PLD_Builder/request_fetcher.py
@@ -97,7 +97,7 @@ def main():
     lck = lock.lock("request_fetcher", non_block = True)
     if lck == None:
         sys.exit(1)
-    init_conf("")
+    init_conf()
     
     status.push("fetching requests")
     if has_new(config.control_url):