From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 3 Aug 2010 18:46:45 +0000 (-0700)
Subject: Remove code related to $DISTDIR/.locks since that directory is
X-Git-Tag: v2.2_rc68~418
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=0596519a09288ac73ce84761284cf734ef1a9867;p=portage.git

Remove code related to $DISTDIR/.locks since that directory is
actually unused.
---

diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index 50c591f9d..b95980539 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -456,8 +456,6 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 			# when inside fakeroot.
 			dir_gid = 0
 		distdir_dirs = [""]
-		if "distlocks" in features:
-			distdir_dirs.append(".locks")
 		try:
 			
 			for x in distdir_dirs:
@@ -504,14 +502,6 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",
 			noiselevel=-1)
 		can_fetch = False
 
-	if can_fetch and use_locks and locks_in_subdir:
-			distlocks_subdir = os.path.join(mysettings["DISTDIR"], locks_in_subdir)
-			if not os.access(distlocks_subdir, os.W_OK):
-				writemsg(_("!!! No write access to write to %s.  Aborting.\n") % distlocks_subdir,
-					noiselevel=-1)
-				return 0
-			del distlocks_subdir
-
 	distdir_writable = can_fetch and not fetch_to_ro
 	failed_files = set()
 	restrict_fetch_msg = False