From: Hans-Christoph Steiner <hans@guardianproject.info>
Date: Mon, 3 Apr 2017 16:04:35 +0000 (+0000)
Subject: Merge branch 'index-parsing' into 'master'
X-Git-Tag: 0.8~86
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=2ba757e6c9933015d9861f0afac7119c6e6c6632;hp=7c34dd96f4b94b02bfb683e00827dfaa5ee7a149;p=fdroidserver.git

Merge branch 'index-parsing' into 'master'

Download and return repository index

See merge request !240
---

diff --git a/setup.py b/setup.py
index a0917810..ab74c946 100644
--- a/setup.py
+++ b/setup.py
@@ -1,13 +1,14 @@
 #!/usr/bin/env python3
 
 from setuptools import setup
+import os
 import sys
 
-# workaround issue on OSX, where sys.prefix is not an installable location
-if sys.platform == 'darwin' and sys.prefix.startswith('/System'):
-    data_prefix = '.'
-else:
+# workaround issue on OSX or --user installs, where sys.prefix is not an installable location
+if os.access(sys.prefix, os.W_OK | os.X_OK):
     data_prefix = sys.prefix
+else:
+    data_prefix = '.'
 
 setup(name='fdroidserver',
       version='0.7.0',