summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Alejandro <ivanalejandro0@gmail.com>2013-09-10 17:03:45 -0300
committerIvan Alejandro <ivanalejandro0@gmail.com>2013-09-10 17:03:45 -0300
commit55190af15f83d22ca3427d941714bb0b59e8b1cf (patch)
tree66d119c5b0d2fe8e9f4d1ac228c46b8e89670adc
parent075d50f10c5ec3be6b008824c34a3aa3509e2c9e (diff)
parent9ff57c8046ed012e907e623188329728eaef267b (diff)
Merge remote-tracking branch 'kali/hotfix/do-not-install-globally' into develop
-rw-r--r--changes/bug_3803-do-not-install-resolv-update-globally1
-rwxr-xr-xsetup.py10
2 files changed, 6 insertions, 5 deletions
diff --git a/changes/bug_3803-do-not-install-resolv-update-globally b/changes/bug_3803-do-not-install-resolv-update-globally
new file mode 100644
index 00000000..f6e06d5f
--- /dev/null
+++ b/changes/bug_3803-do-not-install-resolv-update-globally
@@ -0,0 +1 @@
+ o Do not try to install resolv-update globally. Closes: #3803
diff --git a/setup.py b/setup.py
index 5099c1b1..88cb0e40 100755
--- a/setup.py
+++ b/setup.py
@@ -135,17 +135,17 @@ import platform
_system = platform.system()
IS_LINUX = True if _system == "Linux" else False
+data_files = []
+
if IS_LINUX:
+ # XXX use check_for_permissions to install data
+ # globally. See #3805
data_files = [
- # ("share/man/man1",
- # ["docs/man/bitmask.1"]),
("share/polkit-1/actions",
["pkg/linux/polkit/net.openvpn.gui.leap.policy"]),
- ("/etc/leap/",
+ ("etc/leap/",
["pkg/linux/resolv-update"]),
]
-else:
- data_files = []
setup(
name="leap.bitmask",