Merge pull request DataBrewery#295 from robin900/rbt-auth-test-fix

fixed auth test failures when roles_file or rights_file in unspecified a...
AllanVieira · May 6, 2015 · 1c3fde8 · 1c3fde8
2 parents 004eb82 + 3b5444f
commit 1c3fde8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/cubes/auth.py b/cubes/auth.py
@@ -231,10 +231,10 @@ def __init__(self, rights_file=None, roles_file=None, roles=None,
         roles = roles or {}
         rights = rights or {}
 
-        if not os.path.isabs(roles_file):
+        if roles_file and not os.path.isabs(roles_file):
             roles_file = os.path.join(options["cubes_root"], roles_file)
 
-        if not os.path.isabs(rights_file):
+        if rights_file and not os.path.isabs(rights_file):
             rights_file = os.path.join(options["cubes_root"], rights_file)
 
         if roles_file: