|
@@ -27,15 +27,15 @@ isc.util.process.rename()
|
|
|
|
|
|
# If B10_FROM_SOURCE is set in the environment, we use data files
|
|
# If B10_FROM_SOURCE is set in the environment, we use data files
|
|
# from a directory relative to the value of that variable, or, if defined,
|
|
# from a directory relative to the value of that variable, or, if defined,
|
|
-# relative to the value of B10_FROM_SOURCE_CONFIG_DATA_PATH. Otherwise
|
|
|
|
|
|
+# relative to the value of B10_FROM_SOURCE_LOCALSTATEDIR. Otherwise
|
|
# we use the ones installed on the system.
|
|
# we use the ones installed on the system.
|
|
-# B10_FROM_SOURCE_CONFIG_DATA_PATH is specifically intended to be used for
|
|
|
|
|
|
+# B10_FROM_SOURCE_LOCALSTATEDIR is specifically intended to be used for
|
|
# tests where we want to use variuos types of configuration within the test
|
|
# tests where we want to use variuos types of configuration within the test
|
|
# environment. (We may want to make it even more generic so that the path is
|
|
# environment. (We may want to make it even more generic so that the path is
|
|
# passed from the boss process)
|
|
# passed from the boss process)
|
|
if "B10_FROM_SOURCE" in os.environ:
|
|
if "B10_FROM_SOURCE" in os.environ:
|
|
- if "B10_FROM_SOURCE_CONFIG_DATA_PATH" in os.environ:
|
|
|
|
- DATA_PATH = os.environ["B10_FROM_SOURCE_CONFIG_DATA_PATH"]
|
|
|
|
|
|
+ if "B10_FROM_SOURCE_LOCALSTATEDIR" in os.environ:
|
|
|
|
+ DATA_PATH = os.environ["B10_FROM_SOURCE_LOCALSTATEDIR"]
|
|
else:
|
|
else:
|
|
DATA_PATH = os.environ["B10_FROM_SOURCE"]
|
|
DATA_PATH = os.environ["B10_FROM_SOURCE"]
|
|
else:
|
|
else:
|