From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 9 Sep 2010 17:13:23 +0000 (-0700)
Subject: Combine prefetch conditionals in EbuildFetcher.
X-Git-Tag: v2.2_rc79~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=20375de40f06e9298fe6b18dad0b0a36d1b59ec6;p=portage.git

Combine prefetch conditionals in EbuildFetcher.
---

diff --git a/pym/_emerge/EbuildFetcher.py b/pym/_emerge/EbuildFetcher.py
index 87c82db58..191d56ee7 100644
--- a/pym/_emerge/EbuildFetcher.py
+++ b/pym/_emerge/EbuildFetcher.py
@@ -66,6 +66,7 @@ class EbuildFetcher(SpawnProcess):
 		nocolor = settings.get("NOCOLOR")
 
 		if self.prefetch:
+			fetch_env["PORTAGE_PARALLEL_FETCHONLY"] = "1"
 			# prefetch always outputs to a log, so
 			# always disable color
 			nocolor = "true"
@@ -74,8 +75,6 @@ class EbuildFetcher(SpawnProcess):
 			fetch_env["NOCOLOR"] = nocolor
 
 		fetch_env["PORTAGE_NICENESS"] = "0"
-		if self.prefetch:
-			fetch_env["PORTAGE_PARALLEL_FETCHONLY"] = "1"
 
 		ebuild_binary = os.path.join(
 			settings["PORTAGE_BIN_PATH"], "ebuild")