~azzar1/unity/add-show-desktop-key

userdb/users.sql: Added email field to login.
Propagated the email field through: listusers, makeuser, common.makeuser,
common.db.

added added

removed removed

165

if errors:

166

raise Exception, errors

167

168

def make_user_db(login, uid, password, nick, fullname, rolenm, studentid,

169

force=True):

168

def make_user_db(login, password, uid, email, nick, fullname, rolenm,

169

studentid, force=True):

170

"""Creates a user's entry in the database, filling in all the fields.

171

If force is False, throws an exception if the user already exists.

172

If True, overwrites the user's entry in the DB.

178

dbconn.delete_user(login)

179

except:

180

pass

181

dbconn.create_user(login, uid, password, nick, fullname, rolenm, studentid)

181

dbconn.create_user(login, password, uid, email, nick, fullname, rolenm,

182

studentid)

182

183

dbconn.close()