Fix some spacing on the -* warning, revert Andrew's last change, since it didn't...

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 f523dad4351195a78578baf9011876e13a91ee19..e9459ba32e8b170df27704805e7dd26d60634a2f 100644 (file)
--- 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 3ba5e73caa1c9f8eeeccdf0c022f3bb7d3c5c458..7aefc350242cb6cb1e5b2c5a4e6644bfd88517a7 100644 (file)
--- 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 a99f5316c22d6c61e7e49847e94060b2eaef2730..68aec4b9af545473d516f0260d7263b8f3fd9ad9 100755 (executable)
--- 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 22284711ce59d78d9005b1742e34a91abc9c1bfa..38a7af8fbf5a6384eeb3ad4abbabd3a97b92363c 100755 (executable)
--- 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"