From 5438f9d5f24a1a920bb4f6e4a0c11670a1d2097c Mon Sep 17 00:00:00 2001 From: Eric Edgar Date: Thu, 15 Sep 2005 15:17:27 +0000 Subject: [PATCH] fix bug 106004 split strings into a list for empty and rm operation git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@841 d1e1f19c-881f-0410-ab34-b69fee027534 --- ChangeLog | 6 +++++- modules/generic_stage_target.py | 6 +++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4ff21a2c..4817f581 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.333 2005/09/15 14:31:58 rocket Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.334 2005/09/15 15:17:27 rocket Exp $ + + 15 Sep 2005; Eric Edgar + modules/generic_stage_target.py: + fix bug 106004 split strings into a list for empty and rm operation 15 Sep 2005; Eric Edgar modules/livecd_stage2_target.py: diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py index b15613ab..0fc2689b 100644 --- a/modules/generic_stage_target.py +++ b/modules/generic_stage_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/generic_stage_target.py,v 1.58 2005/09/12 15:31:57 wolf31o2 Exp $ +# $Header: /var/cvsroot/gentoo/src/catalyst/modules/generic_stage_target.py,v 1.59 2005/09/15 15:17:27 rocket Exp $ """ This class does all of the chroot setup, copying of files, etc. It is @@ -790,7 +790,7 @@ class generic_stage_target(generic_target): else: if self.settings.has_key(self.settings["spec_prefix"]+"/empty"): if type(self.settings[self.settings["spec_prefix"]+"/empty"])==types.StringType: - self.settings[self.settings["spec_prefix"]+"/empty"]=[self.settings[self.settings["spec_prefix"]+"/empty"]] + self.settings[self.settings["spec_prefix"]+"/empty"]=self.settings[self.settings["spec_prefix"]+"/empty"].split() for x in self.settings[self.settings["spec_prefix"]+"/empty"]: myemp=self.settings["destpath"]+x if not os.path.isdir(myemp): @@ -813,7 +813,7 @@ class generic_stage_target(generic_target): else: if self.settings.has_key(self.settings["spec_prefix"]+"/rm"): if type(self.settings[self.settings["spec_prefix"]+"/rm"])==types.StringType: - self.settings[self.settings["spec_prefix"]+"/rm"]=[self.settings[self.settings["spec_prefix"]+"/rm"]] + self.settings[self.settings["spec_prefix"]+"/rm"]=self.settings[self.settings["spec_prefix"]+"/rm"].split() for x in self.settings[self.settings["spec_prefix"]+"/rm"]: # we're going to shell out for all these cleaning operations, # so we get easy glob handling -- 2.26.2