We now only set the options for pkgcache if we are not using fetchonly. This should...

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

diff --git a/ChangeLog b/ChangeLog
index d004a8174b6e0da13a0b7e3be43fc58469ba986e..4c52a2f8055197f25a412280f06c5339e81687d4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.654 2006/08/11 02:02:11 wolf31o2 Exp $
+# $Header: /var/cvsroot/gentoo/src/catalyst/ChangeLog,v 1.655 2006/08/11 02:07:19 wolf31o2 Exp $
+
+  11 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
+  targets/support/chroot-functions.sh:
+  We now only set the options for pkgcache if we are not using fetchonly. This
+  should work around a problem where portage won't fetch the files if a binpkg
+  already exists for the package.
 
   09 Aug 2006; Chris Gianelloni <wolf31o2@gentoo.org>
   targets/support/livecdfs-update.sh:

diff --git a/targets/support/chroot-functions.sh b/targets/support/chroot-functions.sh
index 540f40e4d6f4a8dc22e85f330f57da9343821390..63b72578701ad4110d9f48dfdacf2c7a8e70fe3a 100755 (executable)
--- a/targets/support/chroot-functions.sh
+++ b/targets/support/chroot-functions.sh
@@ -70,15 +70,14 @@ setup_myemergeopts(){
        else
                clst_myemergeopts="--quiet"
        fi
-       if [ -n "${clst_PKGCACHE}" ]
-       then
-               export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
-               export bootstrap_opts="-r"
-       fi
        if [ -n "${clst_FETCH}" ]
        then
                export bootstrap_opts="-f"
                export clst_myemergeopts="${clst_myemergeopts} -f"
+       elif [ -n "${clst_PKGCACHE}" ]
+       then
+               export clst_myemergeopts="${clst_myemergeopts} --usepkg --buildpkg --newuse"
+               export bootstrap_opts="-r"
        fi
 }