commit 8bbc49bff6dcf5ca519345ab2ec059b140506395 Author: Pierre-Yves Chibon pingou@pingoured.fr Date: Mon Nov 24 11:31:49 2014 +0100

Drop log as it's undefined and catch more AuthError from FAS

pkgdb2client/utils.py | 27 ++++++++++++++++++++------- 1 files changed, 20 insertions(+), 7 deletions(-) --- diff --git a/pkgdb2client/utils.py b/pkgdb2client/utils.py index 02957e6..9e92795 100644 --- a/pkgdb2client/utils.py +++ b/pkgdb2client/utils.py @@ -107,18 +107,31 @@ def __get_fas_user_by_email(email_address): userid = FASCLIENT._AccountSystem__alternate_email[email_address]

else: - userid = FASCLIENT.people_query( - constraints={'email': email_address}, - columns=['id'] - ) + try: + userid = FASCLIENT.people_query( + constraints={'email': email_address}, + columns=['id'] + ) + except AuthError: + username, password = pkgdb2client.ask_password() + FASCLIENT.username = username + FASCLIENT.password = password + userid = FASCLIENT.people_query( + constraints={'email': email_address}, + columns=['id'] + ) if userid: userid = userid[0].id

user = None if userid: - user = FASCLIENT.person_by_id(userid) - else: - LOG.info('No user id found in FAS for email %s', email_address) + try: + user = FASCLIENT.person_by_id(userid) + except AuthError: + username, password = pkgdb2client.ask_password() + FASCLIENT.username = username + FASCLIENT.password = password + user = FASCLIENT.person_by_id(userid)

return user