diff options
author | kali <kali@leap.se> | 2012-08-03 10:46:22 +0900 |
---|---|---|
committer | kali <kali@leap.se> | 2012-08-03 10:46:22 +0900 |
commit | 0bb8cca027ab32a54f6792ab1b1368e2f1845368 (patch) | |
tree | fbccda410e0df863e1d4f43a1ad10a90ad5f5525 /src/leap/baseapp | |
parent | 5c34052ef9261a47947e3e03616fe34b099b9fa4 (diff) |
check also for a suitable polkit-authentication-agent running
fix #382.
Diffstat (limited to 'src/leap/baseapp')
-rw-r--r-- | src/leap/baseapp/mainwindow.py | 10 | ||||
-rw-r--r-- | src/leap/baseapp/permcheck.py | 7 |
2 files changed, 17 insertions, 0 deletions
diff --git a/src/leap/baseapp/mainwindow.py b/src/leap/baseapp/mainwindow.py index cd6600b4..0e2f4e1d 100644 --- a/src/leap/baseapp/mainwindow.py +++ b/src/leap/baseapp/mainwindow.py @@ -77,6 +77,16 @@ class LeapWindow(QMainWindow): print('debugmode:%s' % self.debugmode) + if self.conductor.missing_auth_agent is True: + dialog = ErrorDialog() + dialog.warningMessage( + 'We could not find any authentication ' + 'agent in your system.<br/>' + 'Make sure you have ' + '<b>polkit-gnome-authentication-agent-1</b> ' + 'running and try again.', + 'error') + if self.conductor.missing_pkexec is True: dialog = ErrorDialog() dialog.warningMessage( diff --git a/src/leap/baseapp/permcheck.py b/src/leap/baseapp/permcheck.py index 58748761..6b74cb6e 100644 --- a/src/leap/baseapp/permcheck.py +++ b/src/leap/baseapp/permcheck.py @@ -1,3 +1,4 @@ +import commands import os from leap.util.fileutil import which @@ -8,3 +9,9 @@ def is_pkexec_in_system(): if not pkexec_path: return False return os.access(pkexec_path, os.X_OK) + + +def is_auth_agent_running(): + return bool( + commands.getoutput( + 'ps aux | grep polkit-[g]nome-authentication-agent-1')) |