diff options
| author | Kali Kaneko <kali@leap.se> | 2014-06-10 15:22:56 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-06-12 11:06:46 -0500 |
| commit | 2f092ea9dbe46d1bebe1576cd7626bf325fe82e5 (patch) | |
| tree | 942af2ed4ae0c48f7d153d1e8654d59cc65effa9 /src/leap/bitmask/util/privilege_policies.py | |
| parent | ba12b3c46ddd4403a4f860cb18796428f2bd3ffb (diff) | |
Install missing stuff into /usr/local/sbin. Closes: #$741
Diffstat (limited to 'src/leap/bitmask/util/privilege_policies.py')
| -rw-r--r-- | src/leap/bitmask/util/privilege_policies.py | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/src/leap/bitmask/util/privilege_policies.py b/src/leap/bitmask/util/privilege_policies.py index 9d1e2c9a..adc3503f 100644 --- a/src/leap/bitmask/util/privilege_policies.py +++ b/src/leap/bitmask/util/privilege_policies.py @@ -24,6 +24,8 @@ import platform from abc import ABCMeta, abstractmethod +from leap.bitmask.config import flags + logger = logging.getLogger(__name__) @@ -71,6 +73,8 @@ class LinuxPolicyChecker(PolicyChecker): """ LINUX_POLKIT_FILE = ("/usr/share/polkit-1/actions/" "se.leap.bitmask.policy") + LINUX_POLKIT_FILE_BUNDLE = ("/usr/share/polkit-1/actions/" + "se.leap.bitmask.bundle.policy") @classmethod def get_polkit_path(self): @@ -79,7 +83,8 @@ class LinuxPolicyChecker(PolicyChecker): :rtype: str """ - return self.LINUX_POLKIT_FILE + return (self.LINUX_POLKIT_FILE_BUNDLE if flags.STANDALONE + else self.LINUX_POLKIT_FILE) def is_missing_policy_permissions(self): # FIXME this name is quite confusing, it does not have anything to do with @@ -90,4 +95,5 @@ class LinuxPolicyChecker(PolicyChecker): :rtype: bool """ - return not os.path.isfile(self.LINUX_POLKIT_FILE) + path = self.get_polkit_path() + return not os.path.isfile(path) |