python: Fix several pep8 whitespace errors.

[cascardo/ovs.git] / python / ovs / dirs.py

diff --git a/python/ovs/dirs.py b/python/ovs/dirs.py
index 5b006cc..a805f0a 100644 (file)
--- a/python/ovs/dirs.py
+++ b/python/ovs/dirs.py
@@ -1,8 +1,19 @@
-# These are the default directories.  They will be replaced by the
-# configured directories at install time.
-
+# The @variables@ in this file are replaced by default directories for
+# use in python/ovs/dirs.py in the source directory and replaced by the
+# configured directories for use in the installed python/ovs/dirs.py.
+#
 import os
-PKGDATADIR = os.environ.get("OVS_PKGDATADIR", "/usr/local/share/openvswitch")
-RUNDIR = os.environ.get("OVS_RUNDIR", "/var/run")
-LOGDIR = os.environ.get("OVS_LOGDIR", "/usr/local/var/log")
-BINDIR = os.environ.get("OVS_BINDIR", "/usr/local/bin")
+
+# Note that the use of """ is to aid in dealing with paths with quotes in them.
+PKGDATADIR = os.environ.get("OVS_PKGDATADIR", """/usr/local/share/openvswitch""")
+RUNDIR = os.environ.get("OVS_RUNDIR", """/var/run""")
+LOGDIR = os.environ.get("OVS_LOGDIR", """/usr/local/var/log""")
+BINDIR = os.environ.get("OVS_BINDIR", """/usr/local/bin""")
+
+DBDIR = os.environ.get("OVS_DBDIR")
+if not DBDIR:
+    sysconfdir = os.environ.get("OVS_SYSCONFDIR")
+    if sysconfdir:
+        DBDIR = "%s/openvswitch" % sysconfdir
+    else:
+        DBDIR = """/usr/local/etc/openvswitch"""