diff options
| author | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-11-26 13:20:36 -0300 |
|---|---|---|
| committer | Ivan Alejandro <ivanalejandro0@gmail.com> | 2013-11-26 13:20:36 -0300 |
| commit | fe5c3113269f86b3c1f82d30d1d25ba5f3421c2d (patch) | |
| tree | 481c14062065a6b9a7547b180531f394e72e5bc7 | |
| parent | bc03b9571fcedf397daaa1451118f0a9a589d416 (diff) | |
| parent | 4ca43c0ea751231a1f59702af9e347541faa859b (diff) | |
Merge remote-tracking branch 'kali/bug/do-not-install-policykit-in-deb' into develop
| -rw-r--r-- | changes/bug_4404-do-not-install-policykit-in-deb | 1 | ||||
| -rw-r--r-- | src/leap/bitmask/services/eip/linuxvpnlauncher.py | 17 |
2 files changed, 11 insertions, 7 deletions
diff --git a/changes/bug_4404-do-not-install-policykit-in-deb b/changes/bug_4404-do-not-install-policykit-in-deb new file mode 100644 index 00000000..80745c05 --- /dev/null +++ b/changes/bug_4404-do-not-install-policykit-in-deb @@ -0,0 +1 @@ +- Avoid attempt to install policykit file in debian package. Closes: #4404 diff --git a/src/leap/bitmask/services/eip/linuxvpnlauncher.py b/src/leap/bitmask/services/eip/linuxvpnlauncher.py index d02f6f96..d24e7ae7 100644 --- a/src/leap/bitmask/services/eip/linuxvpnlauncher.py +++ b/src/leap/bitmask/services/eip/linuxvpnlauncher.py @@ -77,7 +77,7 @@ def _try_to_launch_agent(): Tries to launch a polkit daemon. """ env = None - if flags.STANDALONE is True: + if flags.STANDALONE: env = {"PYTHONPATH": os.path.abspath('../../../../lib/')} try: # We need to quote the command because subprocess call @@ -148,18 +148,21 @@ class LinuxVPNLauncher(VPNLauncher): def missing_other_files(kls): """ 'Extend' the VPNLauncher's missing_other_files to check if the polkit - files is outdated. If the polkit file that is in OTHER_FILES exists but - is not up to date, it is added to the missing list. + files is outdated, in the case of an standalone bundle. + If the polkit file that is in OTHER_FILES exists but is not up to date, + it is added to the missing list. :returns: a list of missing files :rtype: list of str """ # we use `super` in order to send the class to use missing = super(LinuxVPNLauncher, kls).missing_other_files() - polkit_file = LinuxPolicyChecker.get_polkit_path() - if polkit_file not in missing: - if privilege_policies.is_policy_outdated(kls.OPENVPN_BIN_PATH): - missing.append(polkit_file) + + if flags.STANDALONE: + polkit_file = LinuxPolicyChecker.get_polkit_path() + if polkit_file not in missing: + if privilege_policies.is_policy_outdated(kls.OPENVPN_BIN_PATH): + missing.append(polkit_file) return missing |