From 47e98a9ad792e993b44339b68e15be9f1ee90dc5 Mon Sep 17 00:00:00 2001 From: Chris Gianelloni Date: Tue, 20 Mar 2007 16:57:06 +0000 Subject: [PATCH] =?utf8?q?Added=20patch=20from=20=C3=85smund=20Grammeltved?= =?utf8?q?t=20=20to=20add=20portage=5Foverlay=20functio?= =?utf8?q?nality=20to=20GRP,=20where=20it=20was=20mistakenly=20missing,=20?= =?utf8?q?for=20bug=20#171157.=20=20This=20is=20catalyst=202.0.3=20and=20r?= =?utf8?q?eady=20for=20release.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@1224 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 ++++++ catalyst | 2 +- modules/grp_target.py | 3 +-- 3 files changed, 8 insertions(+), 3 deletions(-) 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"] -- 2.26.2