From 5ca906cc875a1debfde1123e461b60411e152b33 Mon Sep 17 00:00:00 2001 From: Ward Vandewege Date: Fri, 25 Mar 2022 17:33:43 -0400 Subject: [PATCH] 18903: handle deleted users properly. Arvados-DCO-1.1-Signed-off-by: Ward Vandewege --- tools/user-activity/arvados_user_activity/main.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/user-activity/arvados_user_activity/main.py b/tools/user-activity/arvados_user_activity/main.py index 2f38db3beb..3fcba5748b 100755 --- a/tools/user-activity/arvados_user_activity/main.py +++ b/tools/user-activity/arvados_user_activity/main.py @@ -33,7 +33,11 @@ def getowner(arv, uuid, owners): return getowner(arv, owners[uuid], owners) def getuserinfo(arv, uuid): - u = arv.users().get(uuid=uuid).execute() + try: + u = arv.users().get(uuid=uuid).execute() + except: + return "deleted user (%susers/%s)" % (arv.config()["Services"]["Workbench1"]["ExternalURL"], + uuid) prof = "\n".join(" %s: \"%s\"" % (k, v) for k, v in u["prefs"].get("profile", {}).items() if v) if prof: prof = "\n"+prof+"\n" -- 2.30.2