# HG changeset patch
# User Yi Qiang <yqiang@gmail.com>
# Date 1211868153 25200
# Node ID 4dc10f052453f49fb87c1efaf7147c404793d406
# Parent  d4f7950871be9f64b52f9e4321ebe0bc128a4c1f
Fix adding default users.

diff -r d4f7950871be -r 4dc10f052453 sage/dsage/scripts/dsage_setup.py
--- a/sage/dsage/scripts/dsage_setup.py	Mon May 26 20:16:10 2008 -0700
+++ b/sage/dsage/scripts/dsage_setup.py	Mon May 26 23:02:33 2008 -0700
@@ -70,14 +70,15 @@
     username = getuser()
     pubkey_file = os.path.join(DSAGE_DIR, 'dsage_key.pub')
     pubkey = keys.Key.fromFile(pubkey_file)
+    pubkey_str = pubkey.toString(type='openssh')
     if clientdb.get_client(username) is None:
-        clientdb.add_client(username, pubkey.toString(type='openssh'))
+        clientdb.add_client(username, pubkey_str)
         print 'Added user %s.\n' % (username)
     else:
         client = clientdb.get_client(username)
-        if client.public_key != pubkey:
+        if client.public_key != pubkey_str:
             clientdb.del_client(username)
-            clientdb.add_client(username, pubkey)
+            clientdb.add_client(username, pubkey_str)
             print "User %s's pubkey changed, setting to new one." % (username)
         else:
             print 'User %s already exists.' % (username)