use download.samba.org::ftp/unpacked/

[build-farm.git] / admin.py

diff --git a/admin.py b/admin.py
index 07c01648525840c81c04cce52ca25d536c51c0b1..fa317f392072cfa78ca04c877d6650b445e487d6 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")
@@ -89,7 +89,7 @@ elif op == "modify":
         mod_op = "platform"
     if mod_op == "platform":
         platform = raw_input("Enter new platform: ")
-        host.update_platform(platform)
+        host.update_platform(platform.decode('utf-8'))
         buildfarm.commit()
     elif mod_op == "owner":
         owner = raw_input("Enter new owner's name: ")
@@ -142,7 +142,7 @@ Your host %(hostname)s has been added to the Samba Build farm.
 We have recorded that it is running %(platform)s.  
 
 If you have not already done so, please read:
-http://build.samba.org/instructions.html
+https://build.samba.org/instructions.html
 
 The password for your rsync .password file is %(password)s