From fda8642d547c85b6e6813d90e1e28276288cc47f Mon Sep 17 00:00:00 2001 From: Jason Stubbs Date: Sat, 17 Dec 2005 10:43:16 +0000 Subject: Check if packages listed in the --resume list have been removed from the relevant trees and report the problem. #103564 svn path=/main/trunk/; revision=2392 --- bin/emerge | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'bin/emerge') diff --git a/bin/emerge b/bin/emerge index 4ce5130e0..7b4e7cd36 100755 --- a/bin/emerge +++ b/bin/emerge @@ -1836,6 +1836,14 @@ class depgraph: if ("--skipfirst" in myopts) and mymergelist: del portage.mtimedb["resume"]["mergelist"][0] del mymergelist[0] + for bigkey in mymergelist: + (pkgtype, root, cpv, action) = bigkey + if pkgtype == "binary" and not portage.db["/"]["bintree"].dbapi.match("="+cpv) or \ + pkgtype == "ebuild" and not portage.db["/"]["porttree"].dbapi.xmatch("match-all", "="+cpv): + print red("!!! Error: The resume list contains packages that no longer") + print red("!!! available to be emerged. Please restart/continue") + print red("!!! the merge operation manually.") + sys.exit(1) else: myfavs=portage.grabfile(portage.root+portage.WORLD_FILE) myfavdict=genericdict(myfavs) -- cgit v1.2.3-1-g7c22