Move set_autoresume_path() from catalyst.target.generic_stage to catalyst.target...

diff --git a/ChangeLog b/ChangeLog
index ad3a0074e50aa17d0a39c9dec05edba123bbc274..01584827aa0d69e5259bff6bddbb97a24c3654e2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/target/generic.py,
+  modules/catalyst/target/generic_stage.py:
+  Move set_autoresume_path() from catalyst.target.generic_stage to
+  catalyst.target.generic
+
   12 Jan 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/target/generic_stage.py, modules/catalyst/target/grp.py,
   modules/catalyst/target/livecd_stage1.py,

diff --git a/modules/catalyst/target/generic.py b/modules/catalyst/target/generic.py
index cd2d7e215c36452836ec500ac253167f4a9b8204..6bcec8be45434aa0ad4b64f66fa0553e6c7140d4 100644 (file)
--- a/modules/catalyst/target/generic.py
+++ b/modules/catalyst/target/generic.py
@@ -3,6 +3,7 @@ The toplevel class for generic_stage_target. This is about as generic as we get.
 """
 
 import catalyst
+from catalyst.output import *
 
 class generic_target:
 
@@ -12,6 +13,17 @@ class generic_target:
                self.env={}
                self.env["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin"
 
+       def set_autoresume_path(self):
+               self.settings["autoresume_path"] = catalyst.util.normpath(self.settings["storedir"] + \
+                       "/tmp/" + self.settings["rel_type"] + "/" + ".autoresume-" + \
+                       self.settings["target"] + "-" + self.settings["subarch"] + "-" + \
+                       self.settings["version_stamp"] + "/")
+               if self.check_autoresume():
+                       msg("The autoresume path is " + self.settings["autoresume_path"])
+               if not os.path.exists(self.settings["autoresume_path"]):
+                       os.makedirs(self.settings["autoresume_path"],0755)
+
+
        def check_autoresume(self, step=None):
                if "AUTORESUME" in self.settings:
                        if step:

diff --git a/modules/catalyst/target/generic_stage.py b/modules/catalyst/target/generic_stage.py
index a531c9e172782fb74602350d0faa3c337c86d760..64ad7725c292ad083af2b45769ebaf9c07fe0c67 100644 (file)
--- a/modules/catalyst/target/generic_stage.py
+++ b/modules/catalyst/target/generic_stage.py
@@ -409,16 +409,6 @@ class generic_stage_target(generic_target):
                        "/tmp/"+self.settings["target_subpath"]+"/")
                self.chroot_lock=catalyst.lock.LockDir(self.settings["chroot_path"])
 
-       def set_autoresume_path(self):
-               self.settings["autoresume_path"]=catalyst.util.normpath(self.settings["storedir"]+\
-                       "/tmp/"+self.settings["rel_type"]+"/"+".autoresume-"+\
-                       self.settings["target"]+"-"+self.settings["subarch"]+"-"+\
-                       self.settings["version_stamp"]+"/")
-               if self.check_autoresume():
-                       print "The autoresume path is " + self.settings["autoresume_path"]
-               if not os.path.exists(self.settings["autoresume_path"]):
-                       os.makedirs(self.settings["autoresume_path"],0755)
-
        def set_controller_file(self):
                self.settings["controller_file"]=catalyst.util.normpath(self.settings["sharedir"]+\
                        "/targets/"+self.settings["target"]+"/"+self.settings["target"]+\