From: Chris Gianelloni <wolf31o2@gentoo.org>
Date: Mon, 10 Mar 2008 18:16:17 +0000 (+0000)
Subject: Fix some spacing on the -* warning, revert Andrew's last change, since it didn't... 
X-Git-Tag: CATALYST_2_0_6_916~128
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8fb15d1306550da4c9e6877706070f23328f0bfa;p=catalyst.git

Fix some spacing on the -* warning, revert Andrew's last change, since it didn't do anything, and clean up the GRP chroot code so it works smarter and set clst_FETCH when clst_grp_type is something other than pkgset.

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

diff --git a/ChangeLog b/ChangeLog
index f523dad4..e9459ba3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,13 @@
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
 # $Id: $
 
+  10 Mar 2008; Chris Gianelloni <wolf31o2@gentoo.org>
+  modules/generic_stage_target.py, targets/grp/grp-chroot.sh,
+  targets/support/chroot-functions.sh:
+  Fix some spacing on the -* warning, revert Andrew's last change, since it
+  didn't do anything, and clean up the GRP chroot code so it works smarter and
+  set clst_FETCH when clst_grp_type is something other than pkgset.
+
   10 Mar 2008; Andrew Gaffney <agaffney@gentoo.org>
   targets/support/chroot-functions.sh:
   Don't set --usepkg and --buildpkg when fetching
diff --git a/modules/generic_stage_target.py b/modules/generic_stage_target.py
index 3ba5e73c..7aefc350 100644
--- a/modules/generic_stage_target.py
+++ b/modules/generic_stage_target.py
@@ -1079,7 +1079,8 @@ class generic_stage_target(generic_target):
 				myf.write('USE="'+string.join(myusevars)+'"\n')
 				if '-*' in myusevars:
 					print "\nWarning!!!  "
-					print "\tThe use of -* in " + self.settings["spec_prefix"] + "/use will cause portage to ignore\n"
+					print "\tThe use of -* in "+self.settings["spec_prefix"]+\
+						"/use will cause portage to ignore"
 					print "\tpackage.use in the profile and portage_confdir. You've been warned!"
 
 			""" Setup the portage overlay """
diff --git a/targets/grp/grp-chroot.sh b/targets/grp/grp-chroot.sh
index a99f5316..68aec4b9 100755
--- a/targets/grp/grp-chroot.sh
+++ b/targets/grp/grp-chroot.sh
@@ -5,13 +5,12 @@ source /tmp/chroot-functions.sh
 ## START BUILD
 setup_pkgmgr
 
-if [ "${clst_grp_type}" = "pkgset" ]
-then
-	export PKGDIR="/tmp/grp/${clst_grp_target}"
+export DISTDIR="/tmp/grp/${clst_grp_target}"
+export PKGDIR="/tmp/grp/${clst_grp_target}"
 
-	run_merge --usepkg --buildpkg --noreplace --newuse ${clst_myemergeopts} \
-		${clst_grp_packages} || exit 1
-else
-	DISTDIR="/tmp/grp/${clst_grp_target}" run_merge --fetchonly \
-		${clst_grp_packages} || exit 1
+if [ "${clst_grp_type}" != "pkgset" ]
+then
+	export clst_FETCH=1
 fi
+
+run_merge --noreplace ${clst_grp_packages} || exit 1
diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 22284711..38a7af8f 100755
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -119,7 +119,7 @@ setup_myemergeopts(){
 	then
 		export bootstrap_opts="-f"
 		export clst_myemergeopts="${clst_myemergeopts} -f"
-	elif [ -n "${clst_PKGCACHE}" -a -z "${clst_FETCH}" ]
+	elif [ -n "${clst_PKGCACHE}" ]
 	then
 		export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
 		export bootstrap_opts="-r"