git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge Master in geni-v3 conflict resolution
[sfa.git]
/
sfa
/
client
/
client_helper.py
diff --git
a/sfa/client/client_helper.py
b/sfa/client/client_helper.py
index
2117b14
..
48160a4
100644
(file)
--- a/
sfa/client/client_helper.py
+++ b/
sfa/client/client_helper.py
@@
-19,9
+19,9
@@
def pg_users_arg(records):
for record in records:
if record['type'] != 'user':
continue
for record in records:
if record['type'] != 'user':
continue
- user = {'urn': record['
reg-
urn'],
- 'keys': record['
reg-
keys'],
- }
+ user = {'urn': record['
geni_
urn'],
+ 'keys': record['keys'],
+
'email': record['email']
}
users.append(user)
return users
users.append(user)
return users