[patch] A correct diff for 2.0.49-r3

portage.py-2.0.49-r3-02.diff (text/plain), 7.37 KB, created by Kurt Hindenburg on 2003-10-07 21:46:38 UTC

--- portage.py-2.0.49-r3	2003-09-03 06:41:57.000000000 -0500
+++ portage.py	2003-09-06 21:28:10.000000000 -0500
@@ -1,9 +1,9 @@
 # portage.py -- core Portage functionality 
 # Copyright 1998-2003 Daniel Robbins, Gentoo Technologies, Inc.
 # Distributed under the GNU Public License v2
-# $Header: /home/cvsroot/gentoo-src/portage/pym/portage.py,v 1.337 2003/08/22 17:09:37 carpaski Exp $
+# $Header: /mnt/alpha/cvsroot/kvh/portage-df/portage.py,v 1.32 2003/09/07 02:28:10 kvh Exp $
 
-VERSION="2.0.49-r3"
+VERSION="2.0.49-r3-k2"
 
 from stat import *
 from commands import *
@@ -1092,6 +1092,38 @@
 	else:
 		return 16            # interrupted by signal
 
+
+#KVH
+def returnFileSizeInDir(mydir,myfile):
+	"If myfile found in mydir, return size of myfile; otherwise 0"
+
+	st_size=0
+	try:
+		mystat=os.stat(mydir+"/"+myfile)
+		st_size=mystat[ST_SIZE]
+	except (OSError,IOError),e:
+		st_size=0
+	return st_size
+
+#KVH
+def findFileInDistDirs(myfile):
+	"Check all directories in DISTDIRS for myfile"
+
+	mydir=""
+
+	if settings["DISTDIRS"]=="":
+		return mydir
+
+# Traverse through all directories
+	for d in settings["DISTDIRS"].split(":"):
+#     print "^^^ Checking for "+myfile+" in "+d
+		st_size=returnFileSizeInDir(d,myfile)
+		if st_size:
+			mydir=d
+			break
+
+	return mydir
+
 def fetch(myuris, listonly=0, fetchonly=0):
 	"fetch files.  Will use digest file if available."
 	if ("mirror" in features) and ("nomirror" in settings["RESTRICT"].split()):
@@ -1110,6 +1142,30 @@
 	resumecommand=string.replace(resumecommand,"${DISTDIR}",settings["DISTDIR"])
 	mydigests=None
 	digestfn=settings["FILESDIR"]+"/digest-"+settings["PF"]
+
+#KVH
+	settings["SRC_LINKS"]=settings["PORTAGE_TMPDIR"]+"/source-links"
+	try:
+		if not os.path.exists(settings["SRC_LINKS"]):
+			os.makedirs(settings["SRC_LINKS"])
+			os.chown(settings["SRC_LINKS"],portage_uid,portage_gid)
+		else:
+			#O.K. we'll clean out old links here...
+			src_links = settings["SRC_LINKS"]
+			files = os.listdir(src_links)
+			for file in files:
+				jfile = src_links+"/"+file
+				if os.path.islink(jfile):
+					os.remove(jfile)
+				else:
+					pass
+
+	except Exception, e:
+		print "!!! Filesystem error. (Read-Only?)"
+		print "!!!",e
+		return 0
+
+
 	if os.path.exists(digestfn):
 		myfile=open(digestfn,"r")
 		mylines=myfile.readlines()
@@ -1173,6 +1229,7 @@
 		else:
 				filedict[myfile].append(myuri)
 	for myfile in filedict.keys():
+#		print "^^^ myfile ",myfile
 		if listonly:
 			fetched=0
 			sys.stderr.write("\n")
@@ -1180,34 +1237,52 @@
 			if listonly:
 				sys.stderr.write(loc+" ")
 				continue
-			try:
-				mystat=os.stat(settings["DISTDIR"]+"/"+myfile)
-				if mydigests!=None and mydigests.has_key(myfile):
-					#if we have the digest file, we know the final size and can resume the download.
-					if mystat[ST_SIZE]<mydigests[myfile]["size"]:
-						fetched=1
+
+			fetched=0
+			indistdirs=0
+			# Try the normal place first
+			filedir=settings["DISTDIR"]
+			mystsize=returnFileSizeInDir(filedir,myfile)
+
+			# If not DISTDIR, try all DISTDIRS
+			if mystsize==0 and settings["DISTDIRS"]:
+				filedir=findFileInDistDirs(myfile)
+				if filedir!="":
+					mystsize=returnFileSizeInDir(filedir,myfile)
+					indistdirs=1
+
+			if mydigests!=None and mydigests.has_key(myfile):
+				#if we have the digest file, we know the final size and can resume the download.
+				if mystsize == 0:
+					fetched=0
+				elif mystsize<mydigests[myfile]["size"]:
+					fetched=1
+					# Do not allow resume for files in DISTDIRS
+					if indistdirs==1:
+						fetched=0
+				else:
+					#we already have it downloaded, skip.
+					#if our file is bigger than the recorded size, digestcheck should catch it.
+					if not fetchonly:
+						fetched=2
 					else:
-						#we already have it downloaded, skip.
-						#if our file is bigger than the recorded size, digestcheck should catch it.
-						if not fetchonly:
-							fetched=2
+						# Check md5sum's at each fetch for fetchonly.
+						mymd5=perform_md5(filedir+"/"+myfile)
+						if mymd5 != mydigests[myfile]["md5"]:
+							sys.stderr.write("!!! Previously fetched file: "+str(myfile)+" MD5 FAILED! Refetching...\n")
+#							os.unlink(settings["DISTDIR"]+"/"+myfile)
+							fetched=0
 						else:
-							# Check md5sum's at each fetch for fetchonly.
-							mymd5=perform_md5(settings["DISTDIR"]+"/"+myfile)
-							if mymd5 != mydigests[myfile]["md5"]:
-								sys.stderr.write("!!! Previously fetched file: "+str(myfile)+" MD5 FAILED! Refetching...\n")
-								os.unlink(settings["DISTDIR"]+"/"+myfile)
-								fetched=0
-							else:
-								sys.stderr.write(">>> Previously fetched file: "+str(myfile)+" MD5 ;-)\n")
-								fetched=2
-								break #No need to keep looking for this file, we have it!
-				else:
-					#we don't have the digest file, but the file exists.  Assume it is fully downloaded.
-					fetched=2
-			except (OSError,IOError),e:
-				fetched=0
+							sys.stderr.write(">>> Previously fetched file: "+str(myfile)+" MD5 ;-)\n")
+							fetched=2
+							break #No need to keep looking for this file, we have it!
+			else:
+				#we don't have the digest file, but the file exists.  Assume it is fully downloaded.
+				fetched=2
 			if fetched!=2:
+				# Reset filedir to point to original DISTDIR
+				filedir=settings["DISTDIR"]
+
 				#we either need to resume or start the download
 				#you can't use "continue" when you're inside a "try" block
 				if fetched==1:
@@ -1269,6 +1344,22 @@
 		if (fetched!=2) and not listonly:
 			sys.stderr.write("!!! Couldn't download "+str(myfile)+". Aborting.\n")
 			return 0
+
+#KVH
+# Create a new directory to store all the distfile links.
+# settings["SRC_LINKS"]=settings["PORTAGE_TMPDIR"]+"/source-links"
+		if not listonly and not fetchonly:
+#			print "^^^ "+myfile+" is located in "+filedir
+			target = filedir + "/" + myfile
+			dest = settings["SRC_LINKS"] + "/" + myfile
+#			print "^^^ "+target+" --> "+dest
+			try:
+				os.symlink(target,dest)
+			except Exception, e:
+				# Should not happen since we clear out the directory above.
+				# May already exists...should likely ignore errors here...
+				print "^^^ Error : "+dest+ " already exists! (ignore)"
+	
 	return 1
 
 
@@ -1294,8 +1385,11 @@
 	"""generates digest file if missing.  Assumes all files are available.	If
 	overwrite=0, the digest will only be created if it doesn't already exist."""
 
+# KVH - Change basedir to SRC_LINKS
+#  basedir=settings["DISTDIR"]+"/"
+	basedir=settings["SRC_LINKS"]+"/"
+
 	# archive files
-	basedir=settings["DISTDIR"]+"/"
 	digestfn=settings["FILESDIR"]+"/digest-"+settings["PF"]
 
 	# portage files -- p(ortagefiles)basedir
@@ -1521,11 +1615,27 @@
 			retval=spawnebuild(actionmap[mydo]["dep"],actionmap,debug,alwaysdep)
 			if retval:
 				return retval
-	# spawn ebuild.sh
+
+#KVH
+	settings["ODISTDIR"]=settings["DISTDIR"]
+	settings["DISTDIR"]=settings["SRC_LINKS"]
+
+#  print "^^^ Current [DISTDIR] "+settings["DISTDIR"]
+   # spawn ebuild.sh
 	mycommand="/usr/sbin/ebuild.sh "
-	return spawn(mycommand + mydo,debug,
-				actionmap[mydo]["args"][0],
-				actionmap[mydo]["args"][1])
+	ret=spawn(mycommand + mydo,debug,
+		actionmap[mydo]["args"][0],
+		actionmap[mydo]["args"][1])
+
+	settings["DISTDIR"]=settings["ODISTDIR"]
+
+	return ret
+
+	# spawn ebuild.sh
+#	mycommand="/usr/sbin/ebuild.sh "
+#	return spawn(mycommand + mydo,debug,
+#				actionmap[mydo]["args"][0],
+#				actionmap[mydo]["args"][1])
 
 def doebuild(myebuild,mydo,myroot,debug=0,listonly=0,fetchonly=0):
 	global settings