From 9736c1e9209b5d0868aa70aed86d31aa78bf159b Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Sat, 4 Mar 2017 20:57:24 -0500 Subject: [PATCH] Don't fail for nonexistent users in AgendavRm. --- lib/rm/plugins/agendav.rb | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/lib/rm/plugins/agendav.rb b/lib/rm/plugins/agendav.rb index e84c4f6..921bfe0 100644 --- a/lib/rm/plugins/agendav.rb +++ b/lib/rm/plugins/agendav.rb @@ -16,11 +16,17 @@ class AgendavRm # Remove *user* from the Agendav database. This should remove him # from _every_ table in which he is referenced. # + # We do not raise an error if the user doesn't exist. This is due to + # an unfortunate problem with the "user exists" check in AgenDAV. + # The AgenDAV "shares" table is not tied directly to a username, so + # we are forced to use a regexp match to decide what rows to delete + # from that table. We do so regardless of whether or not the username + # exists in the "prefs" table, because that table stores only non- + # default preferences -- not all users' preferences. + # # @param user [User] the user to remove. # def remove_user(user) - raise NonexistentUserError.new(user.to_s()) if not user_exists(user) - sql_queries = ['DELETE FROM prefs WHERE username = $1;'] # The "shares" table contains principal URLs, and the "@" symbol -- 2.43.2