Changeset 40dd8c1

Timestamp:

Sep 9, 2009 9:52:44 AM (15 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

11860f52

Parents:

f07fa49

Message:

make file_copy a utility route so many can use it.

Location:

fedd/federation

Files:

• experiment_control.py (modified) (3 diffs)
• util.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -339 +339 @@
         }
 
-    def copy_file(self, src, dest, size=1024):
-        """
-        Exceedingly simple file copy.
-        """
-        s = open(src,'r')
-        d = open(dest, 'w')
-
-        buf = "x"
-        while buf != "":
-            buf = s.read(size)
-            d.write(buf)
-        s.close()
-        d.close()
-
     # Call while holding self.state_lock
     def write_state(self):
@@ -362 +348 @@
         """
         if os.access(self.state_filename, os.W_OK):
-            self.copy_file(self.state_filename, \
-                    "%s.bak" % self.state_filename)
+            copy_file(self.state_filename, \
+                    "%s.bak" % self.state_filename)
         try:
             f = open(self.state_filename, 'w')
@@ -1602 +1588 @@
                         "Cannot write hosts file: %s" % e)
             try:
-                self.copy_file("%s" % gw_pubkey, "%s/%s" % \
+                copy_file("%s" % gw_pubkey, "%s/%s" % \
                         (configdir, gw_pubkey_base))
-                self.copy_file("%s" % gw_secretkey, "%s/%s" % \
+                copy_file("%s" % gw_secretkey, "%s/%s" % \
                         (configdir, gw_secretkey_base))
             except IOError, e:

fedd/federation/util.py

@@ -153 +153 @@
             log.error("Bad experiment_log value: %s" % level_str)
 
+def copy_file(src, dest, size=1024):
+    """
+    Exceedingly simple file copy.  Throws an IOError if there's a problem.
+    """
+    s = open(src,'r')
+    d = open(dest, 'w')
+
+    buf = s.read(size)
+    while buf != "":
+        d.write(buf)
+        buf = s.read(size)
+    s.close()
+    d.close()
+