Changeset 13208

Timestamp:

21 Aug 2015, 14:19:06 (9 years ago)

Author:

uli

Message:

Use VAR_DIR as parameter. This is easier to recall.

File:

• main/waeup.uniben/trunk/src/waeup/uniben/scripts.py (modified) (2 diffs)

main/waeup.uniben/trunk/src/waeup/uniben/scripts.py

@@ -23 +23 @@
 TO_BE_GROKKED = ("waeup.kofa", "kofacustom.nigeria", "waeup.uniben")
 
-#: The data root from where we can look out for Data.fs, etc.
-#: We usually expect a `var/` directory in this root.
-INSTANCE_HOME = os.path.dirname(os.path.dirname(os.path.dirname(
-    os.path.dirname(__file__))))
+#: The data root from where we can look out for Data.fs, etc. This is
+#: normally the `var/` dir of an instance.
+VAR_DIR = os.path.join(os.path.dirname(os.path.dirname(os.path.dirname(
+    os.path.dirname(__file__)))), 'var')
 
 #: The name of the `University` instance in which we look for export
@@ -59 +59 @@
     #         blob/master/src/ZODB/cross-database-references.txt
     databases = {}
-    root_dir = INSTANCE_HOME
-    db_dir = os.path.join(root_dir, 'var', 'filestorage')
-    blob_dir = os.path.join(root_dir, 'var', 'blobstorage')
+    db_dir = os.path.join(VAR_DIR, 'filestorage')
+    blob_dir = os.path.join(VAR_DIR, 'blobstorage')
     db_path = os.path.join(db_dir, 'Data.fs')
     async_db_path = os.path.join(db_dir, 'Data.async.fs')