Added patch from Åsmund Grammeltvedt <grammel@online.no> to add portage_overlay funct...

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

diff --git a/ChangeLog b/ChangeLog
index 8c8aa21496b6eb4fb929479bf0438ec9d484dc1d..1ccffd013d64140d7f1b16d184d32a5754e72745 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,12 @@
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  20 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org> catalyst,
+  modules/grp_target.py:
+  Added patch from Åsmund Grammeltvedt <grammel@online.no> to add
+  portage_overlay functionality to GRP, where it was mistakenly missing, for
+  bug #171157. This is catalyst 2.0.3 and ready for release.
+
   12 Mar 2007; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/livecd-stage1/livecd-stage1-controller.sh,
   targets/support/livecdfs-update.sh:

diff --git a/catalyst b/catalyst
index b67021a4c418cfeaaf28d4d06f01f0f18181d600..79679a4e8397e932dc5dab48142a1542f69dc10a 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -8,7 +8,7 @@ import os,sys,imp,string,getopt
 import pdb
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
-__version__="2.0.3_pre3"
+__version__="2.0.3"
 
 conf_values={}
 

diff --git a/modules/grp_target.py b/modules/grp_target.py
index f2fb5470f7e4fe7c6e620445d814a11ff79a5f10..036b41bb34dee85a1bb13b65400ef535439cc433 100644 (file)
--- a/modules/grp_target.py
+++ b/modules/grp_target.py
@@ -108,10 +108,9 @@ class grp_target(generic_stage_target):
                                        if os.path.isfile(normpath(destdir+"/"+i)):
                                                self.gen_digest_file(normpath(destdir+"/"+i))
 
-                   
        def set_action_sequence(self):
            self.settings["action_sequence"]=["unpack","unpack_snapshot",\
-                                           "config_profile_link","setup_confdir","bind","chroot_setup",\
+                                           "config_profile_link","setup_confdir","portage_overlay","bind","chroot_setup",\
                                            "setup_environment","run_local","unbind",\
                                            "generate_digests","clear_autoresume"]