From: Chris Gianelloni Date: Tue, 20 Mar 2007 16:57:06 +0000 (+0000) Subject: Added patch from Åsmund Grammeltvedt to add portage_overlay funct... X-Git-Tag: CATALYST_2_0_6_916~270 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=47e98a9ad792e993b44339b68e15be9f1ee90dc5;p=catalyst.git Added patch from Åsmund Grammeltvedt 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. 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 8c8aa214..1ccffd01 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,12 @@ # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 # $Id: $ + 20 Mar 2007; Chris Gianelloni catalyst, + modules/grp_target.py: + Added patch from Åsmund Grammeltvedt 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 targets/livecd-stage1/livecd-stage1-controller.sh, targets/support/livecdfs-update.sh: diff --git a/catalyst b/catalyst index b67021a4..79679a4e 100755 --- a/catalyst +++ b/catalyst @@ -8,7 +8,7 @@ import os,sys,imp,string,getopt import pdb __maintainer__="Chris Gianelloni " -__version__="2.0.3_pre3" +__version__="2.0.3" conf_values={} diff --git a/modules/grp_target.py b/modules/grp_target.py index f2fb5470..036b41bb 100644 --- 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"]