[patch] 2.1_pre3-distdir-revert.patch

2.1_pre3-distdir-revert.patch (text/plain), 1.43 KB, created by Zac Medico on 2006-01-06 10:55:41 UTC

Index: portage-2.1_pre3-r1/pym/portage.py
===================================================================
--- portage-2.1_pre3-r1.orig/pym/portage.py
+++ portage-2.1_pre3-r1/pym/portage.py
@@ -2802,31 +2802,6 @@ def doebuild(myebuild,mydo,myroot,mysett
 	if need_distfiles and not fetch(fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
 		return 1
 
-	# inefficient.  improve this logic via making actionmap easily searchable to see if we're in the chain of what
-	# will be executed, either that or forced N doebuild calls instead of a single set of phase calls.
-	if (mydo not in ("setup", "clean", "postinst", "preinst", "prerm", "fetch", "digest", "manifest") and 
-		"noauto" not in features) or mydo == "unpack":
-		orig_distdir = mysettings["DISTDIR"]
-		edpath = mysettings["DISTDIR"] = os.path.join(mysettings["PORTAGE_BUILDDIR"], "distdir")
-		if os.path.exists(edpath):
-			try:
-				if os.path.isdir(edpath) and not os.path.islink(edpath):
-					shutil.rmtree(edpath)
-				else:
-					os.unlink(edpath)
-			except OSError:
-				print "!!! Failed reseting ebuild distdir path, " + edpath
-				raise
-		os.mkdir(edpath)
-		os.chown(edpath, -1, portage_gid)
-		os.chmod(edpath, 0775)
-		try:
-			for file in aalist:
-				os.symlink(os.path.join(orig_distdir, file), os.path.join(edpath, file))
-		except OSError:
-			print "!!! Failed symlinking in '%s' to ebuild distdir" % file
-			raise
-
 	if mydo=="fetch" and listonly:
 		return 0