From d2950d9c5fe82c068ab5f2d17768792cd33ea7ab Mon Sep 17 00:00:00 2001 From: James Valleroy Date: Tue, 16 Aug 2016 13:29:42 -0400 Subject: [PATCH] users: Display error message if unable to set SSH keys --- plinth/modules/users/forms.py | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/plinth/modules/users/forms.py b/plinth/modules/users/forms.py index 6f733155b..686d3f928 100644 --- a/plinth/modules/users/forms.py +++ b/plinth/modules/users/forms.py @@ -207,9 +207,15 @@ class UserUpdateForm(ValidNewUsernameCheckMixin, forms.ModelForm): messages.error(self.request, _('Failed to add user to group.')) - actions.superuser_run( - 'ssh', ['set-keys', '--username', user.get_username(), - '--keys', self.cleaned_data['ssh_keys'].strip()]) + try: + actions.superuser_run( + 'ssh', ['set-keys', '--username', user.get_username(), + '--keys', self.cleaned_data['ssh_keys'].strip()]) + except ActionError: + messages.error( + self.request, + _('Unable to set SSH keys. Please wait a minute and then ' + 'try again.')) return user