[gentoo-portage-dev] [PATCH] Ignore blockers when fetching and using --ask

[gentoo-portage-dev] [PATCH] Ignore blockers when fetching and using --ask

[Jason Stubbs]

[-- Attachment #1: Type: text/plain, Size: 23 bytes --]

Subject says it all...

[-- Attachment #2: ignore-blockers-on-fetch.patch --]
[-- Type: text/x-diff, Size: 540 bytes --]

diff -uNr 2.0/bin/emerge 2.0-patched/bin/emerge
--- 2.0/bin/emerge	2005-09-27 13:16:09.000000000 +0900
+++ 2.0-patched/bin/emerge	2005-09-27 15:18:53.000000000 +0900
@@ -3173,7 +3173,7 @@
 				if x[3]!="nomerge":
 					mergecount+=1
 				#check for blocking dependencies
-				if x[0]=="blocks":
+				if x[0]=="blocks" and "--fetchonly" not in myopts and "--fetch-all-uri" not in myopts:
 					print "\n!!! Error: The above package list contains packages which cannot be installed"
 					print   "!!!        on the same system."
 					print

Re: [gentoo-portage-dev] [PATCH] Ignore blockers when fetching and using --ask

[Jason Stubbs]

[-- Attachment #1: Type: text/plain, Size: 237 bytes --]

While not harmful, there was one issue with the previous patch; the parent of 
the blocking package would be fetched as well. This would usually mean that 
one of the packages being merged would be fetched twice. This patch fixes 
that.

[-- Attachment #2: ignore-blockers-on-fetch.patch --]
[-- Type: text/x-diff, Size: 1138 bytes --]

diff -uNr 2.0/bin/emerge 2.0-patched/bin/emerge
--- 2.0/bin/emerge	2005-09-27 13:16:09.000000000 +0900
+++ 2.0-patched/bin/emerge	2005-09-27 15:34:03.000000000 +0900
@@ -3173,7 +3173,7 @@
 				if x[3]!="nomerge":
 					mergecount+=1
 				#check for blocking dependencies
-				if x[0]=="blocks":
+				if x[0]=="blocks" and "--fetchonly" not in myopts and "--fetch-all-uri" not in myopts:
 					print "\n!!! Error: The above package list contains packages which cannot be installed"
 					print   "!!!        on the same system."
 					print
@@ -3224,7 +3224,14 @@
 						y=portage.portdb.findname(pkgline[2])
 						tmpsettings = portage.config(clone=portage.settings)
 						retval=portage.doebuild(y,"digest",portage.root,tmpsettings,edebug,("--pretend" in myopts))
-			mydepgraph.merge(mydepgraph.altlist())
+			if "--fetchonly" in myopts or "--fetch-all-uri" in myopts:
+				pkglist = []
+				for pkg in mydepgraph.altlist():
+					if pkg[0] != "blocks":
+						pkglist.append(pkg)
+			else:
+				pkglist = mydepgraph.altlist()
+			mydepgraph.merge(pkglist)
 
 		if portage.mtimedb.has_key("resume"):
 			del portage.mtimedb["resume"]