Make display of shortcut box nicer

[build-farm.git] / admin.py

diff --git a/admin.py b/admin.py
index 4dd2b9854e9c7644f8b547fc8db9cb2a9729474e..60679f815da553e827d91e90fb38a621544a46d1 100755 (executable)
--- a/admin.py
+++ b/admin.py
@@ -18,9 +18,9 @@
 #
 
 from buildfarm import (
+    BuildFarm,
     hostdb,
     )
-from buildfarm.sqldb import StormCachingBuildFarm
 import commands
 import os
 import smtplib
@@ -28,7 +28,7 @@ import sys
 import time
 from email.MIMEText import MIMEText
 
-buildfarm = StormCachingBuildFarm()
+buildfarm = BuildFarm()
 
 def update_rsyncd_secrets():
     temp_rsyncd_secrets = os.path.join(os.path.dirname(__file__), "../rsyncd.secrets.new")
@@ -38,14 +38,6 @@ def update_rsyncd_secrets():
 
     os.rename(temp_rsyncd_secrets, "../rsyncd.secrets")
 
-def update_hosts_list():
-    temp_hosts_list_file = os.path.join(os.path.dirname(__file__), "web", "hosts.list.new")
-    f = open(temp_hosts_list_file, "w")
-    f.writelines(buildfarm.hostdb.create_hosts_list())
-    f.close()
-
-    os.rename(temp_hosts_list_file, os.path.join(os.path.dirname(__file__), "web/hosts.list"))
-
 dry_run = False
 
 print "Samba Build farm management tool"
@@ -82,7 +74,6 @@ elif op == "remove":
         else:
             buildfarm.hostdb.commit()
             update_rsyncd_secrets()
-            update_hosts_list()
 elif op == "modify":
     hostname = raw_input("Please enter hostname to modify: ")
     try:
@@ -109,7 +100,6 @@ elif op == "modify":
         print "Unknown subcommand %s" % mod_op
         sys.exit(1)
     update_rsyncd_secrets()
-    update_hosts_list()
 elif op == "add":
     hostname = raw_input("Machine hostname: ")
     try:
@@ -193,7 +183,6 @@ Thanks, your friendly Samba build farm administrator <build@samba.org>""" % owne
             s.sendmail(msg["From"], recipients, msg.as_string())
         s.quit()
         update_rsyncd_secrets()
-        update_hosts_list()
 elif op == "info":
     if not args:
         args = [raw_input("Hostname: ")]