From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 22 Oct 2010 14:05:14 +0000 (-0700)
Subject: EbuildFetchonly: remove redundant tmpdir code
X-Git-Tag: v2.2.0_alpha1~13
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=99145f3a3e87d000a11d21bcebe91ac601a242fe;p=portage.git

EbuildFetchonly: remove redundant tmpdir code

This tempdir stuff is handled by spawn_nofetch() now.
---

diff --git a/pym/_emerge/EbuildFetchonly.py b/pym/_emerge/EbuildFetchonly.py
index 0ab1a723e..2cb3061a3 100644
--- a/pym/_emerge/EbuildFetchonly.py
+++ b/pym/_emerge/EbuildFetchonly.py
@@ -1,8 +1,7 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 from _emerge.SlotObject import SlotObject
-import shutil
 import portage
 from portage import os
 from portage.elog.messages import eerror
@@ -21,44 +20,17 @@ class EbuildFetchonly(SlotObject):
 		settings.setcpv(pkg)
 		debug = settings.get("PORTAGE_DEBUG") == "1"
 
-		if 'fetch' in pkg.metadata.restrict:
-			rval = self._execute_with_builddir()
-		else:
-			rval = portage.doebuild(ebuild_path, "fetch",
-				settings["ROOT"], settings, debug=debug,
-				listonly=self.pretend, fetchonly=1, fetchall=self.fetch_all,
-				mydbapi=portdb, tree="porttree")
+		rval = portage.doebuild(ebuild_path, "fetch",
+			settings["ROOT"], settings, debug=debug,
+			listonly=self.pretend, fetchonly=1, fetchall=self.fetch_all,
+			mydbapi=portdb, tree="porttree")
 
-			if rval != os.EX_OK:
-				msg = "Fetch failed for '%s'" % (pkg.cpv,)
-				eerror(msg, phase="unpack", key=pkg.cpv)
+		if rval != os.EX_OK:
+			msg = "Fetch failed for '%s'" % (pkg.cpv,)
+			eerror(msg, phase="unpack", key=pkg.cpv)
 
 		return rval
 
-	def _execute_with_builddir(self):
-		# To spawn pkg_nofetch requires PORTAGE_BUILDDIR for
-		# ensuring sane $PWD (bug #239560) and storing elog
-		# messages. Use a private temp directory, in order
-		# to avoid locking the main one.
-		settings = self.settings
-		global_tmpdir = settings["PORTAGE_TMPDIR"]
-		from tempfile import mkdtemp
-		try:
-			private_tmpdir = mkdtemp("", "._portage_fetch_.", global_tmpdir)
-		except OSError as e:
-			if e.errno != portage.exception.PermissionDenied.errno:
-				raise
-			raise portage.exception.PermissionDenied(global_tmpdir)
-		settings["PORTAGE_TMPDIR"] = private_tmpdir
-		settings.backup_changes("PORTAGE_TMPDIR")
-		try:
-			retval = self._execute()
-		finally:
-			settings["PORTAGE_TMPDIR"] = global_tmpdir
-			settings.backup_changes("PORTAGE_TMPDIR")
-			shutil.rmtree(private_tmpdir)
-		return retval
-
 	def _execute(self):
 		settings = self.settings
 		pkg = self.pkg