Changeset d199ced for fedd/fedd_experiment_control.py

Timestamp:

Oct 14, 2008 5:35:15 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-1.30, version-2.00, version-3.01, version-3.02

Children:

3925b50

Parents:

0b466d1

Message:

upgrade

File:

• fedd/fedd_experiment_control.py (modified) (3 diffs)

fedd/fedd_experiment_control.py

@@ -344 +344 @@
             f = open(self.state_filename, "r")
             self.state = pickle.load(f)
+            self.log.debug("[read_state]: Read state from %s" % \
+                    self.state_filename)
         except IOError, e:
-            self.log.warning("No saved state: Can't open %s: %s" % \
-                    (self.state_filename, e))
+            self.log.warning("[read_state]: No saved state: Can't open %s: %s"\
+                    % (self.state_filename, e))
         except pickle.UnpicklingError, e:
-            self.log.warning("No saved state: Unpickling failed: %s" % e)
+            self.log.warning(("[read_state]: No saved state: " + \
+                    "Unpickling failed: %s") % e)
 
     def scp_file(self, file, user, host, dest=""):
@@ -359 +362 @@
         rv = 0
 
+        try:
+            dnull = open("/dev/null", "r")
+        except IOError:
+            self.log.debug("[ssh_file]: failed to open /dev/null for redirect")
+            dnull = Null
+
         self.log.debug("[scp_file]: %s" % " ".join(scp_cmd))
         if not self.debug:
-            rv = call(scp_cmd, stdout=trace, stderr=trace)
+            if dnull: rv = call(scp_cmd, stdout=dnull, stderr=dnull)
+            else: rv = call(scp_cmd)
 
         return rv == 0
@@ -372 +382 @@
         sh_str = "%s %s@%s %s" % (self.ssh_exec, user, host, cmd)
 
+        try:
+            dnull = open("/dev/null", "r")
+        except IOError:
+            self.log.debug("[ssh_cmd]: failed to open /dev/null for redirect")
+            dnull = Null
+
         self.log.debug("[ssh_cmd]: %s" % sh_str)
         if not self.debug:
-            sub = Popen(sh_str, shell=True, stdout=trace, stderr=trace)
+            if dnull:
+                sub = Popen(sh_str, shell=True, stdout=dnull, stderr=dnull)
+            else:
+                sub = Popen(sh_str, shell=True)
             return sub.wait() == 0
         else: