summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Stubbs <jstubbs@gentoo.org>2005-12-17 10:43:16 +0000
committerJason Stubbs <jstubbs@gentoo.org>2005-12-17 10:43:16 +0000
commitfda8642d547c85b6e6813d90e1e28276288cc47f (patch)
treede032a89227332271906607c346f6c1d6a0fbf41
parent84f473c175c8556a16932deb51dc64923503e4cd (diff)
downloadportage-fda8642d547c85b6e6813d90e1e28276288cc47f.tar.gz
portage-fda8642d547c85b6e6813d90e1e28276288cc47f.tar.bz2
portage-fda8642d547c85b6e6813d90e1e28276288cc47f.zip
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
-rwxr-xr-xbin/emerge8
1 files changed, 8 insertions, 0 deletions
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)