Add catalyst.util.copy() helper function and use it

diff --git a/ChangeLog b/ChangeLog
index bab7ffe7417a5a47ce8f808dc6f61c3c4bac0ffc..f926b6f937e06d80cdb2a473774a93bad7483c91 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  13 Sep 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/target/generic_stage.py, modules/catalyst/util.py:
+  Add catalyst.util.copy() helper function and use it
+
   13 Sep 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/target/generic_stage.py, modules/catalyst/util.py:
   Create catalyst.util.mkdir() helper function and use it

diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index 31fc5a75f58be1429b7dc450eb590ac2cfd73abd..85708f4e16cca6ba664a3bee7424abdede6d0f62 100644 (file)
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -702,9 +702,7 @@ class generic_stage_target(generic_target):
                        if "portage_confdir" in self.settings:
                                msg("Configuring /etc/portage...")
                                catalyst.util.remove_path(self.settings["chroot_path"] + "/etc/portage")
-                               cmd("cp -R "+self.settings["portage_confdir"]+"/ "+\
-                                       self.settings["chroot_path"]+"/etc/portage",\
-                                       "Error copying /etc/portage",env=self.env)
+                               catalyst.util.copy(self.settings["portage_confdir"] + "/", self.settings["chroot_path"] + "/etc/portage", recursive=True)
                                self.set_autoresume("setup_confdir")
 
        def portage_overlay(self):
@@ -714,9 +712,8 @@ class generic_stage_target(generic_target):
                                if os.path.exists(x):
                                        msg("Copying overlay dir " + x)
                                        catalyst.util.mkdir(self.settings["chroot_path"] + "/usr/local/portage")
-                                       cmd("cp -R "+x+"/* "+self.settings["chroot_path"]+\
-                                               "/usr/local/portage",\
-                                               "Could not copy portage_overlay",env=self.env)
+                                       # Perhaps we should use rsync here?
+                                       catalyst.util.copy(x + "/*", self.settings["chroot_path"] + "/usr/local/portage", recursive=True)
 
        def root_overlay(self):
                """ Copy over the root_overlay """
@@ -815,8 +812,7 @@ class generic_stage_target(generic_target):
 
                        #self.makeconf=catalyst.util.read_makeconf(self.settings["chroot_path"]+"/etc/make.conf")
 
-                       cmd("cp /etc/resolv.conf "+self.settings["chroot_path"]+"/etc",\
-                               "Could not copy resolv.conf into place.",env=self.env)
+                       catalyst.util.copy("/etc/resolv.conf", self.settings["chroot_path"] + "/etc")
 
                        """ Copy over the envscript, if applicable """
                        if "ENVSCRIPT" in self.settings:
@@ -832,9 +828,7 @@ class generic_stage_target(generic_target):
                                msg("\tCatalyst Maintainers use VERY minimal envscripts if used at all")
                                msg("\tYou have been warned\n")
 
-                               cmd("cp "+self.settings["ENVSCRIPT"]+" "+\
-                                       self.settings["chroot_path"]+"/tmp/envscript",\
-                                       "Could not copy envscript into place.",env=self.env)
+                               catalyst.util.copy(self.settings["ENVSCRIPT"], self.settings["chroot_path"] + "/tmp/envscript")
 
                        """ Setup metadata_overlay """
                        if "METADATA_OVERLAY" in self.settings \
@@ -856,8 +850,7 @@ class generic_stage_target(generic_target):
                                cmd("mv "+self.settings["chroot_path"]+"/etc/hosts "+\
                                        self.settings["chroot_path"]+"/etc/hosts.catalyst",\
                                        "Could not backup /etc/hosts",env=self.env)
-                               cmd("cp /etc/hosts "+self.settings["chroot_path"]+"/etc/hosts",\
-                                       "Could not copy /etc/hosts",env=self.env)
+                               catalyst.util.copy("/etc/hosts", self.settings["chroot_path"] + "/etc/hosts")
 
                        """ Modify and write out make.conf (for the chroot) """
                        catalyst.util.remove_path(self.settings["chroot_path"] + "/etc/make.conf")
@@ -903,9 +896,8 @@ class generic_stage_target(generic_target):
                                myf.write('PORTDIR_OVERLAY="/usr/local/portage"\n')
 
                        myf.close()
-                       cmd("cp "+self.settings["chroot_path"]+"/etc/make.conf "+\
-                               self.settings["chroot_path"]+"/etc/make.conf.catalyst",\
-                               "Could not backup /etc/make.conf",env=self.env)
+                       catalyst.util.copy(self.settings["chroot_path"] + "/etc/make.conf", \
+                               self.settings["chroot_path"] + "/etc/make.conf.catalyst")
                        self.set_autoresume("chroot_setup")
 
        def fsscript(self):
@@ -1200,13 +1192,8 @@ class generic_stage_target(generic_target):
                                                                        "Required value boot/kernel/config not specified"
 
                                                        try:
-                                                               cmd("cp "+self.settings["boot/kernel/"+kname+\
-                                                                       "/config"]+" "+\
-                                                                       self.settings["chroot_path"]+"/var/tmp/"+\
-                                                                       kname+".config",\
-                                                                       "Couldn't copy kernel config: "+\
-                                                                       self.settings["boot/kernel/"+kname+\
-                                                                       "/config"],env=self.env)
+                                                               catalyst.util.copy(self.settings["boot/kernel/" + kname + "/config"],
+                                                                       self.settings["chroot_path"] + "/var/tmp/" + kname + ".config")
 
                                                        except CatalystError:
                                                                self.unbind()
@@ -1249,12 +1236,10 @@ class generic_stage_target(generic_target):
                                                                                self.settings["boot/kernel/" + kname + \
                                                                                "/initramfs_overlay"])
 
-                                                                       cmd("cp -R "+self.settings["boot/kernel/"+\
-                                                                               kname+"/initramfs_overlay"]+"/* "+\
-                                                                               self.settings["chroot_path"]+\
-                                                                               "/tmp/initramfs_overlay/"+\
-                                                                               self.settings["boot/kernel/"+kname+\
-                                                                               "/initramfs_overlay"],env=self.env)
+                                                                       catalyst.util.copy(self.settings["boot/kernel/" + kname + "/initramfs_overlay"] + "/*",
+                                                                               self.settings["chroot_path"] + "/tmp/initramfs_overlay/" + \
+                                                                               self.settings["boot/kernel/" + kname + "/initramfs_overlay"], \
+                                                                               recursive=True)
 
                                                        """ Execute the script that builds the kernel """
                                                        self.run_controller_action("kernel", kname)

diff --git a/modules/catalyst/util.py b/modules/catalyst/util.py
index d1b73abfab970b66a712fe8084c04c4e30806740..e00ec558f4709a31825202576261174fa029d63f 100644 (file)
--- a/modules/catalyst/util.py
+++ b/modules/catalyst/util.py
@@ -274,4 +274,13 @@ def mkdir(path, perms=0755):
        except:
                raise CatalystError("Could not create directory '%s'" % (path,))
 
+def copy(src, dest, recursive=False):
+       copy_cmd = "copy "
+       if recursive:
+               copy_cmd += "-R "
+       copy_cmd += src + " " + dest
+       retval = catalyst.spawn.spawn_bash(copy_cmd)
+       if retval != 0:
+               raise CatalystError("Could not copy path '%s'" % (src,))
+
 # vim: ts=4 sw=4 sta noet sts=4 ai