[tor-commits] [chutney/master] use CHUTNEY_DATA_DIR in one more place

[nickm at torproject.org]

commit 9e329c4319cde98a846032528ca017a22c2a3a40
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Jun 19 12:32:28 2016 -0400

    use CHUTNEY_DATA_DIR in one more place
---
 lib/chutney/TorNet.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/chutney/TorNet.py b/lib/chutney/TorNet.py
index 57d19e0..0eb4a76 100644
--- a/lib/chutney/TorNet.py
+++ b/lib/chutney/TorNet.py
@@ -807,7 +807,8 @@ class Network(object):
         self._nodes.append(n)
 
     def move_aside_nodes(self):
-        nodesdir = os.path.join(os.getcwd(), 'net', 'nodes')
+        net_base_dir = os.environ.get('CHUTNEY_DATA_DIR', 'net')
+        nodesdir = os.path.join(net_base_dir, 'nodes')
 
         if not os.path.exists(nodesdir):
             return