[tor-commits] [ooni-probe/master] In virtualenvs the /usr/share path is actually prefix/share/

[art@xxxxxxxxxxxxxx]

commit 38775a3d39f598e925170f5f30792a44415a8a74
Author: Arturo Filastò <arturo@xxxxxxxxxxx>
Date:   Tue Sep 13 15:41:11 2016 +0200

    In virtualenvs the /usr/share path is actually prefix/share/
---
 ooni/settings.py | 2 +-
 setup.py         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/ooni/settings.py b/ooni/settings.py
index 409e81e..be0025d 100644
--- a/ooni/settings.py
+++ b/ooni/settings.py
@@ -168,7 +168,7 @@ if IS_VIRTUALENV:
     )
     USR_SHARE_PATH = os.path.join(
         _PREFIX,
-        'usr', 'share', 'ooni'
+        'share', 'ooni'
     )
     ETC_PATH = os.path.join(
         _PREFIX,
diff --git a/setup.py b/setup.py
index 753cf07..e6031c6 100644
--- a/setup.py
+++ b/setup.py
@@ -152,7 +152,7 @@ def mkdir_p(path):
     try:
         os.makedirs(path)
     except OSError as ose:
-        if ose != errno.EEXIST:
+        if ose.errno != errno.EEXIST:
             raise
 
 class OoniInstall(InstallCommand):



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits