[Pkg-anonymity-tools] [torbrowser-launcher] 15/48: temporarily disable AppArmor profiles in Ubuntu (#128)

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository torbrowser-launcher.

commit 5da9724710b28e558c29b13afe8d4dc8284a4a89
Author: Micah Lee <micah at micahflee.com>
Date:   Wed Oct 1 00:56:13 2014 +0000

    temporarily disable AppArmor profiles in Ubuntu (#128)
---
 setup.py | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/setup.py b/setup.py
index a7dfff9..43c5d7a 100644
--- a/setup.py
+++ b/setup.py
@@ -27,10 +27,11 @@ OTHER DEALINGS IN THE SOFTWARE.
 """
 
 from distutils.core import setup
-import os
-import sys
+import os, sys, subprocess
 SHARE = 'share'
 
+# detect linux distribution
+distro = subprocess.check_output(['lsb_release', '-i']).split()[-1]
 
 def file_list(path):
     files = []
@@ -47,13 +48,15 @@ for root, dirs, files in os.walk(SHARE):
     datafiles.append((os.path.join(sys.prefix, root),
                       [os.path.join(root, f) for f in files]))
 
-if not hasattr(sys, 'real_prefix'):
-    # we're not in a virtualenv, so we can probably write to /etc
-    datafiles += [('/etc/apparmor.d/', [
-        'apparmor/torbrowser.Browser.firefox',
-        'apparmor/torbrowser.start-tor-browser',
-        'apparmor/torbrowser.Tor.tor',
-        'apparmor/usr.bin.torbrowser-launcher'])]
+# disable shipping apparmor profiles until they work in ubuntu (#128)
+if distro != 'Ubuntu':
+    if not hasattr(sys, 'real_prefix'):
+        # we're not in a virtualenv, so we can probably write to /etc
+        datafiles += [('/etc/apparmor.d/', [
+            'apparmor/torbrowser.Browser.firefox',
+            'apparmor/torbrowser.start-tor-browser',
+            'apparmor/torbrowser.Tor.tor',
+            'apparmor/usr.bin.torbrowser-launcher'])]
 
 setup(
     name='torbrowser-launcher',

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/torbrowser-launcher.git