[patch] patch against portage-2.1-r1

distlocks_and_roskip.patch (text/plain), 2.54 KB, created by David-John Miller on 2006-08-05 12:54:27 UTC

--- portage.py	2006-08-05 19:08:37.000000000 +0000
+++ portage.py.new	2006-08-05 19:49:38.000000000 +0000
@@ -1902,6 +1902,8 @@
 
 def fetch(myuris, mysettings, listonly=0, fetchonly=0, locks_in_subdir=".locks",use_locks=1, try_mirrors=1):
 	"fetch files.  Will use digest file if available."
+	if locks_in_subdir == '':
+		locks_in_subdir = '.locks'
 
 	features = mysettings.features
 	# 'nomirror' is bad/negative logic. You Restrict mirroring, not no-mirroring.
@@ -1929,13 +1931,14 @@
 	if "skiprocheck" in features:
 		fetch_to_ro = 1
 
-	if not os.access(mysettings["DISTDIR"],os.W_OK) and fetch_to_ro:
-		if use_locks:
-			writemsg(red("!!! You are fetching to a read-only filesystem, you should turn locking off"),
-				noiselevel=-1)
-			writemsg("!!! This can be done by adding -distlocks to FEATURES in /etc/make.conf",
-				noiselevel=-1)
-#			use_locks = 0
+	if not locks_in_subdir.startswith('/'):
+		locks_in_subdir = mysettings["DISTDIR"]+"/"+locks_in_subdir
+		
+	if use_locks and fetch_to_ro and not os.access(locks_in_subdir,os.W_OK):
+		writemsg(red("!!! You are fetching to a read-only filesystem, you should turn locking off\n"),
+			noiselevel=-1)
+		writemsg("!!! This can be done by adding -distlocks to FEATURES in /etc/make.conf\n",
+			noiselevel=-1)
 
 	# local mirrors are always added
 	if custommirrors.has_key("local"):
@@ -2117,7 +2120,7 @@
 		else:
 			if use_locks and can_fetch:
 				if locks_in_subdir:
-					file_lock = portage_locks.lockfile(mysettings["DISTDIR"]+"/"+locks_in_subdir+"/"+myfile,wantnewlockfile=1)
+					file_lock = portage_locks.lockfile(locks_in_subdir+"/"+myfile,wantnewlockfile=1)
 				else:
 					file_lock = portage_locks.lockfile(mysettings["DISTDIR"]+"/"+myfile,wantnewlockfile=1)
 		try:
@@ -2247,7 +2250,8 @@
 								except:
 									portage_util.writemsg("chown failed on distfile: " + str(myfile),
 										noiselevel=-1)
-							os.chmod(mysettings["DISTDIR"]+"/"+myfile,0664)
+							if "skiprocheck" not in features:
+								os.chmod(mysettings["DISTDIR"]+"/"+myfile,0664)
 
 					if mydigests!=None and mydigests.has_key(myfile):
 						try:
@@ -2941,7 +2945,7 @@
 	# we will try and fetch 4 times :/
 	need_distfiles = (mydo in ("digest", "fetch", "unpack") or
 	                  mydo != "manifest" and "noauto" not in features)
-	if need_distfiles and not fetch(fetchme, mysettings, listonly=listonly, fetchonly=fetchonly):
+	if need_distfiles and not fetch(fetchme, mysettings, listonly=listonly, fetchonly=fetchonly, locks_in_subdir=mysettings["DISTLOCKS_SUBDIR"]):
 		return 1
 
 	if mydo=="fetch" and listonly: