Merge branch 'master' into storyboard-impl

1 files changed, 19 insertions, 4 deletions

diff --git a/rumba/model.py b/rumba/model.py
index d2f7567..ffb67cc 100644
--- a/rumba/model.py
+++ b/rumba/model.py
@@ -20,7 +20,9 @@
 # MA  02110-1301  USA
 
 import abc
+import os
 import random
+import stat
 import time
 
 import rumba.log as log
@@ -39,7 +41,22 @@ except ImportError:
         return random.expovariate(1.0 / mean_duration)
 
     logger.debug("Falling back to simple implementations.")
-    # PROBLEM! These logs will almost never be printed...
+    # PROBLEM! These logs will almost never be printed... But we might not care
+
+tmp_dir = '/tmp/rumba'
+try:
+    os.mkdir(tmp_dir)
+    os.chmod(tmp_dir, stat.S_IRWXU | stat.S_IRWXG | stat.S_IRWXO)
+except OSError:
+    # Already there, nothing to do
+    pass
+
+cache_dir = os.path.join(os.path.expanduser("~"), '.cache/rumba/')
+try:
+    os.mkdir(cache_dir)
+except OSError:
+    # Already there, nothing to do
+    pass
 
 
 # Represents generic testbed info
@@ -245,8 +262,6 @@ class Node:
         s += ", ".join(rl)
         s += " ]\n"
 
-        s += "  Policies: [ "
-
         return s
 
     def __hash__(self):
@@ -719,7 +734,7 @@ class Experiment:
                         break
 
     def dump_ssh_info(self):
-        f = open('ssh_info', 'w')
+        f = open(os.path.join(tmp_dir, 'ssh_info'), 'w')
         for node in self.nodes:
             f.write("%s;%s;%s;%s;%s\n" % (node.name,
                                           self.testbed.username,