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

diff --git a/ChangeLog b/ChangeLog
index 4ff21a2cce73b275b0b3340079e5e0281ec6eaad..4817f5814b5461ef8f25f14de9d8778e4b6aef29 100644 (file)
--- 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 <rocket@gentoo.org>
+  modules/generic_stage_target.py:
+  fix bug 106004 split strings into a list for empty and rm operation
 
   15 Sep 2005; Eric Edgar <rocket@gentoo.org>
   modules/livecd_stage2_target.py:

diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index b15613abd1dd8016c56f78caaacd02b630f4a8f0..0fc2689becbe3a4ab0015b00eb079765ccbc37dd 100644 (file)
--- 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