proper quoting for livecd-stage1.sh call

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

diff --git a/modules/targets.py b/modules/targets.py
index f2020c90c2bddefa5118e80f37e2bbb08f7bd2c8..d928f283d9761d6e4a7491020d3ef1cd8627bcfb 100644 (file)
--- a/modules/targets.py
+++ b/modules/targets.py
@@ -417,8 +417,13 @@ class livecd_stage1_target(generic_stage_target):
                generic_stage_target.__init__(self,spec,addlargs)
 
        def run_local(self):
+               mypack=self.settings["livecd/packages"][:]
+               for x in range(0,len(mypack)):
+                       #surround args with quotes for passing to bash, allows things like "<" to remain intact
+                       mypack[x]='"'+mypack[x]+'"'
+               mypack=string.join(mypack)
                try:
-                       cmd("/bin/bash "+self.settings["sharedir"]+"/targets/livecd-stage1/livecd-stage1.sh run "+string.join(self.settings["livecd/packages"]))
+                       cmd("/bin/bash "+self.settings["sharedir"]+"/targets/livecd-stage1/livecd-stage1.sh run "+mypack)
                except CatalystError:
                        self.unbind()
                        raise CatalystError,"GRP build aborting due to error."