[llvm-commits] [zorg] r125890 - in /zorg/trunk/llvmlab/llvmlab: ui/app.py user.py

[Daniel Dunbar]

Author: ddunbar
Date: Fri Feb 18 10:42:10 2011
New Revision: 125890

URL: http://llvm.org/viewvc/llvm-project?rev=125890&view=rev
Log:
llvmlab.user: Add SVN login field.

Modified:
    zorg/trunk/llvmlab/llvmlab/ui/app.py
    zorg/trunk/llvmlab/llvmlab/user.py

Modified: zorg/trunk/llvmlab/llvmlab/ui/app.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/ui/app.py?rev=125890&r1=125889&r2=125890&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/ui/app.py (original)
+++ zorg/trunk/llvmlab/llvmlab/ui/app.py Fri Feb 18 10:42:10 2011
@@ -79,7 +79,8 @@
                 id = self.config['ADMIN_LOGIN'],
                 passhash = self.config['ADMIN_PASSHASH'],
                 name = self.config['ADMIN_NAME'],
-                email = self.config['ADMIN_EMAIL']))
+                email = self.config['ADMIN_EMAIL'],
+                htpasswd = None))
 
         self.config.data = data
 

Modified: zorg/trunk/llvmlab/llvmlab/user.py
URL: http://llvm.org/viewvc/llvm-project/zorg/trunk/llvmlab/llvmlab/user.py?rev=125890&r1=125889&r2=125890&view=diff
==============================================================================
--- zorg/trunk/llvmlab/llvmlab/user.py (original)
+++ zorg/trunk/llvmlab/llvmlab/user.py Fri Feb 18 10:42:10 2011
@@ -12,17 +12,20 @@
             raise ValueError, "Unknown version"
 
         return User(data['id'], data['passhash'],
-                    data['name'], data['email'])
+                    data['name'], data['email'],
+                    data['htpasswd'])
 
     def todata(self):
         return { 'version' : 0,
                  'id' : self.id,
                  'passhash' : self.passhash,
                  'name' : self.name,
-                 'email' : self.email }
+                 'email' : self.email,
+                 'htpasswd' : self.htpasswd }
 
-    def __init__(self, id, passhash, name, email):
+    def __init__(self, id, passhash, name, email, htpasswd):
         self.id = id
         self.passhash = passhash
         self.name = name
         self.email = email
+        self.htpasswd = htpasswd