[gentoo-portage-dev] [PATCH 2/4] portage.package.ebuild.fetch: Use PORTAGE_ACTUAL_DISTDIR for fetching

[Michał Górny]

---
 pym/portage/package/ebuild/fetch.py | 45 ++++++++++++++++++++-----------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/pym/portage/package/ebuild/fetch.py b/pym/portage/package/ebuild/fetch.py
index 0431e11ea..90b6f2e54 100644
--- a/pym/portage/package/ebuild/fetch.py
+++ b/pym/portage/package/ebuild/fetch.py
@@ -346,7 +346,13 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 	if "skiprocheck" in features:
 		fetch_to_ro = 1
 
-	if not os.access(mysettings["DISTDIR"],os.W_OK) and fetch_to_ro:
+	# we do not want to fetch to the shadow dir ;-)
+	if "PORTAGE_ACTUAL_DISTDIR" in mysettings:
+		distdir = mysettings["PORTAGE_ACTUAL_DISTDIR"]
+	else:
+		distdir = mysettings["DISTDIR"]
+
+	if not os.access(distdir,os.W_OK) and fetch_to_ro:
 		if use_locks:
 			writemsg(colorize("BAD",
 				_("!!! For fetching to a read-only filesystem, "
@@ -376,7 +382,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 	if digests is None and not (pkgdir is None or skip_manifest):
 		mydigests = mysettings.repositories.get_repo_for_location(
 			os.path.dirname(os.path.dirname(pkgdir))).load_manifest(
-			pkgdir, mysettings["DISTDIR"]).getTypeDigests("DIST")
+			pkgdir, distdir).getTypeDigests("DIST")
 	elif digests is None or skip_manifest:
 		# no digests because fetch was not called for a specific package
 		mydigests = {}
@@ -505,7 +511,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 		try:
 			
 			for x in distdir_dirs:
-				mydir = os.path.join(mysettings["DISTDIR"], x)
+				mydir = os.path.join(distdir, x)
 				write_test_file = os.path.join(
 					mydir, ".__portage_test_write__")
 
@@ -536,15 +542,15 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 						raise OperationNotPermitted(
 							_("Failed to apply recursive permissions for the portage group."))
 		except PortageException as e:
-			if not os.path.isdir(mysettings["DISTDIR"]):
+			if not os.path.isdir(distdir):
 				writemsg("!!! %s\n" % str(e), noiselevel=-1)
-				writemsg(_("!!! Directory Not Found: DISTDIR='%s'\n") % mysettings["DISTDIR"], noiselevel=-1)
+				writemsg(_("!!! Directory Not Found: DISTDIR='%s'\n") % distdir, noiselevel=-1)
 				writemsg(_("!!! Fetching will fail!\n"), noiselevel=-1)
 
 	if can_fetch and \
 		not fetch_to_ro and \
-		not os.access(mysettings["DISTDIR"], os.W_OK):
-		writemsg(_("!!! No write access to '%s'\n") % mysettings["DISTDIR"],
+		not os.access(distdir, os.W_OK):
+		writemsg(_("!!! No write access to '%s'\n") % distdir,
 			noiselevel=-1)
 		can_fetch = False
 
@@ -599,7 +605,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 			if size is not None:
 				pruned_digests["size"] = size
 
-		myfile_path = os.path.join(mysettings["DISTDIR"], myfile)
+		myfile_path = os.path.join(distdir, myfile)
 		has_space = True
 		has_space_superuser = True
 		file_lock = None
@@ -611,10 +617,10 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 			vfs_stat = None
 			if size is not None and hasattr(os, "statvfs"):
 				try:
-					vfs_stat = os.statvfs(mysettings["DISTDIR"])
+					vfs_stat = os.statvfs(distdir)
 				except OSError as e:
 					writemsg_level("!!! statvfs('%s'): %s\n" %
-						(mysettings["DISTDIR"], e),
+						(distdir, e),
 						noiselevel=-1, level=logging.ERROR)
 					del e
 
@@ -715,14 +721,14 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 								"ME_MIN_SIZE)\n") % mystat.st_size)
 							temp_filename = \
 								_checksum_failure_temp_file(
-								mysettings["DISTDIR"], myfile)
+								distdir, myfile)
 							writemsg_stdout(_("Refetching... "
 								"File renamed to '%s'\n\n") % \
 								temp_filename, noiselevel=-1)
 						elif mystat.st_size >= size:
 							temp_filename = \
 								_checksum_failure_temp_file(
-								mysettings["DISTDIR"], myfile)
+								distdir, myfile)
 							writemsg_stdout(_("Refetching... "
 								"File renamed to '%s'\n\n") % \
 								temp_filename, noiselevel=-1)
@@ -750,7 +756,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 				# the file is not already fetched
 				if not has_space:
 					writemsg(_("!!! Insufficient space to store %s in %s\n") % \
-						(myfile, mysettings["DISTDIR"]), noiselevel=-1)
+						(myfile, distdir), noiselevel=-1)
 
 					if has_space_superuser:
 						writemsg(_("!!! Insufficient privileges to use "
@@ -836,7 +842,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 								if distdir_writable:
 									temp_filename = \
 										_checksum_failure_temp_file(
-										mysettings["DISTDIR"], myfile)
+										distdir, myfile)
 									writemsg_stdout(_("Refetching... "
 										"File renamed to '%s'\n\n") % \
 										temp_filename, noiselevel=-1)
@@ -985,10 +991,9 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 						"FILE":    myfile
 					}
 
-					for k in ("DISTDIR", "PORTAGE_SSH_OPTS"):
-						v = mysettings.get(k)
-						if v is not None:
-							variables[k] = v
+					if "PORTAGE_SSH_OPTS" in mysettings:
+						variables["PORTAGE_SSH_OPTS"] = mysettings["PORTAGE_SSH_OPTS"]
+					variables["DISTDIR"] = distdir
 
 					myfetch = shlex_split(locfetch)
 					myfetch = [varexpand(x, mydict=variables) for x in myfetch]
@@ -1069,7 +1074,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 										) as f:
 										if html404.search(f.read()):
 											try:
-												os.unlink(mysettings["DISTDIR"]+"/"+myfile)
+												os.unlink(distdir+"/"+myfile)
 												writemsg(_(">>> Deleting invalid distfile. (Improper 404 redirect from server.)\n"))
 												fetched = 0
 												continue
@@ -1097,7 +1102,7 @@ def fetch(myuris, mysettings, listonly=0, fetchonly=0,
 										return 0
 									temp_filename = \
 										_checksum_failure_temp_file(
-										mysettings["DISTDIR"], myfile)
+										distdir, myfile)
 									writemsg_stdout(_("Refetching... "
 										"File renamed to '%s'\n\n") % \
 										temp_filename, noiselevel=-1)
-- 
2.12.0