From: Daniel Robbins <drobbins@gentoo.org>
Date: Mon, 12 Jan 2004 06:20:33 +0000 (+0000)
Subject: test fix
X-Git-Tag: CATALYST_1_0_1~99
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e42e25c98c9e0e6240d25fea3a19d603cc021aa9;p=catalyst.git

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 d928f283..2e3dc389 100644
--- 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 ca7f46ba..3a0faef7 100755
--- 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
 	;;