- execute wrap.wrap(main) only is used as top-level

Changed files:
    PLD_Builder/file_sender.py -> 1.7
    PLD_Builder/load_balancer.py -> 1.6
    PLD_Builder/request_fetcher.py -> 1.6
    PLD_Builder/request_handler.py -> 1.16
    PLD_Builder/rpm_builder.py -> 1.8
    PLD_Builder/srpm_builder.py -> 1.15

diff --git a/PLD_Builder/file_sender.py b/PLD_Builder/file_sender.py
index 71ac8ddc77eed6e0bb79d81c12a9a269ff11fd65..43675fabe861051c2e23fac0251531b3421a99ef 100644 (file)
--- a/PLD_Builder/file_sender.py
+++ b/PLD_Builder/file_sender.py
@@ -162,4 +162,5 @@ def main():
   maybe_flush_queue(path.buildlogs_queue_dir)
   maybe_flush_queue(path.ftp_queue_dir)
 
-wrap.wrap(main)
+if __name__ == '__main__':
+  wrap.wrap(main)

diff --git a/PLD_Builder/load_balancer.py b/PLD_Builder/load_balancer.py
index 41e72fdd0e07ea2fa63fadf81c542de63a800690..067c2cf53a93007cfbb9a2a8d4c92c6d0bddf021 100644 (file)
--- a/PLD_Builder/load_balancer.py
+++ b/PLD_Builder/load_balancer.py
@@ -60,4 +60,5 @@ def main():
   except:
     pass
 
-wrap.wrap(main)
+if __name__ == '__main__':
+  wrap.wrap(main)

diff --git a/PLD_Builder/request_fetcher.py b/PLD_Builder/request_fetcher.py
index 794361e21119272653cc37e4ac7024999883e7bc..31a06dfec917a4d4205434660c350d115e84c673 100644 (file)
--- a/PLD_Builder/request_fetcher.py
+++ b/PLD_Builder/request_fetcher.py
@@ -90,5 +90,6 @@ def main():
     f.write("%d\n" % max_no)
     f.close()
   status.pop()
-
-wrap.wrap(main)
+  
+if __name__ == '__main__':
+  wrap.wrap(main)

diff --git a/PLD_Builder/request_handler.py b/PLD_Builder/request_handler.py
index 115f9c835b3553cef071eb3462311529063881a5..4dc9f1f0c31abd6bbf36aa677313e14ec1dd3931 100644 (file)
--- a/PLD_Builder/request_handler.py
+++ b/PLD_Builder/request_handler.py
@@ -130,4 +130,5 @@ def main():
   status.pop()
   sys.exit(0)
 
-wrap.wrap(main)
+if __name__ == '__main__':
+  wrap.wrap(main)

diff --git a/PLD_Builder/rpm_builder.py b/PLD_Builder/rpm_builder.py
index 07ac91ac0c20ffa743b00348708a0b158bb299f9..4b76ee2f796b37c968298326f5e216bd9ea3cb45 100644 (file)
--- a/PLD_Builder/rpm_builder.py
+++ b/PLD_Builder/rpm_builder.py
@@ -112,10 +112,8 @@ def check_load():
   except:
     pass
 
-def main():
-  if len(sys.argv) < 2:
-    raise "fatal: need to have builder name as first arg"
-  init_conf(sys.argv[1])
+def main_for(builder):
+  init_conf(builder)
   # allow only one build in given builder at once
   if not lock.lock("building-rpm-for-%s" % config.builder, non_block = 1):
     return
@@ -156,4 +154,10 @@ def main():
   handle_request(r)
   status.pop()
   
-wrap.wrap(main)
+def main():
+  if len(sys.argv) < 2:
+    raise "fatal: need to have builder name as first arg"
+  return main_for(sys.argv[1])
+  
+if __name__ == '__main__':
+  wrap.wrap(main)

diff --git a/PLD_Builder/srpm_builder.py b/PLD_Builder/srpm_builder.py
index 74fdf8a18d876499695f41257c248f3b1d6cb5b2..bfe863593be7034cdff233235e4fd00121b4d952 100644 (file)
--- a/PLD_Builder/srpm_builder.py
+++ b/PLD_Builder/srpm_builder.py
@@ -130,4 +130,5 @@ def main():
   handle_request(r)
   status.pop()
 
-wrap.wrap(main)
+if __name__ == '__main__':
+  wrap.wrap(main)