test fix

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

diff --git a/modules/targets.py b/modules/targets.py
index d928f283d9761d6e4a7491020d3ef1cd8627bcfb..2e3dc3898f01bb3111658f6385694b9dfa8c2507 100644 (file)
--- a/modules/targets.py
+++ b/modules/targets.py
@@ -420,7 +420,7 @@ class livecd_stage1_target(generic_stage_target):
                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[x]="'"+mypack[x]+"'"
                mypack=string.join(mypack)
                try:
                        cmd("/bin/bash "+self.settings["sharedir"]+"/targets/livecd-stage1/livecd-stage1.sh run "+mypack)
@@ -482,7 +482,7 @@ class livecd_stage3_target(generic_stage_target):
                        myunmerge=self.settings["livecd/unmerge"][:]
                        for x in range(0,len(myunmerge)):
                                #surround args with quotes for passing to bash, allows things like "<" to remain intact
-                               myunmerge[x]='"'+myunmerge[x]+'"'
+                               myunmerge[x]="'"+myunmerge[x]+"'"
                        myunmerge=string.join(myunmerge)
                        #before cleaning, unmerge stuff:
                        cmd("/bin/bash "+self.settings["sharedir"]+"/targets/"+self.settings["target"]+"/unmerge.sh "+myunmerge,"unmerge script failed.")

diff --git a/targets/livecd-stage1/livecd-stage1.sh b/targets/livecd-stage1/livecd-stage1.sh
index ca7f46ba3bea63481bd18cd9e8570baed530f890..3a0faef7da8a01a24115f0ffc5136aabff033672 100755 (executable)
--- a/targets/livecd-stage1/livecd-stage1.sh
+++ b/targets/livecd-stage1/livecd-stage1.sh
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.2 2003/12/23 06:36:52 drobbins Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/targets/livecd-stage1/Attic/livecd-stage1.sh,v 1.3 2004/01/12 06:20:33 drobbins Exp $
 
 case $1 in
 enter)
@@ -8,7 +8,6 @@ enter)
        ;;
 run)
        shift
-       export clst_packages="$*"
        $clst_CHROOT $clst_chroot_path /bin/bash << EOF
        env-update
        source /etc/profile
@@ -21,12 +20,15 @@ run)
        USE="build" emerge portage
        #turn off auto-use:
        export USE_ORDER="env:conf:defaults"    
-       if [ -n "${clst_PKGCACHE}" ]
-       then
-               emerge --usepkg --buildpkg --noreplace $clst_packages || exit 1
-       else
-               emerge --noreplace $clst_packages || exit 1
-       fi
+       for x in $*
+       do
+               if [ -n "${clst_PKGCACHE}" ]
+               then
+                       emerge --usepkg --buildpkg --noreplace "\$x" || exit 1
+               else
+                       emerge --noreplace "\$x" || exit 1
+               fi
+       done
 EOF
        [ $? -ne 0 ] && exit 1
        ;;