Fix folder name for grp build dir to not have .tar.bz2 at the end

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@923 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/ChangeLog b/ChangeLog
index e754b2aad3908def385720c47b82212f917bba4b..32c01cb7c4e331fff35d24e0afc1dd5abea4f682 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.410 2005/12/01 19:18:27 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.411 2005/12/01 21:29:30 rocket Exp $
+
+  01 Dec 2005; Eric Edgar <rocket@gentoo.org> modules/grp_target.py:
+  Fix folder name for grp build dir to not have .tar.bz2 at the end
 
   01 Dec 2005; Eric Edgar <rocket@gentoo.org> catalyst, files/catalyst.conf,
   modules/catalyst_support.py, modules/generic_stage_target.py:

diff --git a/modules/grp_target.py b/modules/grp_target.py
index 02ff1f683e6c766d120c293bd8e4ef1484576a18..281258b146003c7a44844ddc3a1b0874c8c4997f 100644 (file)
--- a/modules/grp_target.py
+++ b/modules/grp_target.py
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/modules/grp_target.py,v 1.15 2005/11/22 20:36:18 rocket Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/modules/grp_target.py,v 1.16 2005/12/01 21:29:30 rocket Exp $
 
 """
 The builder class for GRP (Gentoo Reference Platform) builds.
@@ -32,7 +32,21 @@ class grp_target(generic_stage_target):
                        self.required_values.append("grp/"+x+"/type")
                        
                generic_stage_target.__init__(self,spec,addlargs)
-       
+
+        def set_target_path(self):
+                self.settings["target_path"]=normpath(self.settings["storedir"]+"/builds/"+self.settings["target_subpath"]+"/")
+                if self.settings.has_key("AUTORESUME") \
+                        and os.path.exists(self.settings["autoresume_path"]+"setup_target_path"):
+                                print "Resume point detected, skipping target path setup operation..."
+                else:
+                        # first clean up any existing target stuff
+                        if os.path.isdir(self.settings["target_path"]):
+                                cmd("rm -rf "+self.settings["target_path"],
+                                "Could not remove existing directory: "+self.settings["target_path"])
+                                touch(self.settings["autoresume_path"]+"setup_target_path")
+                        if not os.path.exists(self.settings["target_path"]):
+                                os.makedirs(self.settings["target_path"])
+
        def run_local(self):
                for pkgset in self.settings["grp"]:
                        # example call: "grp.sh run pkgset cd1 xmms vim sys-apps/gleep"
@@ -55,8 +69,8 @@ class grp_target(generic_stage_target):
        def set_action_sequence(self):
            self.settings["action_sequence"]=["unpack","unpack_snapshot",\
                                "config_profile_link","setup_confdir","bind","chroot_setup",\
-                                           "setup_environment","run_local","unmerge","unbind",\
-                                           "remove","empty","clear_autoresume"]
+                                           "setup_environment","run_local","unbind",\
+                                           "clear_autoresume"]
 
        
        def set_use(self):