Make the merge phase bail out if srcroot doesn't exist for bug #140159.

svn path=/main/trunk/; revision=3857

diff --git a/pym/portage.py b/pym/portage.py
index acaefa30b71fad303896d9a54a62ba6f2019b183..4ff350ce73e1a6409d9ebad629a168c4bc7f9e95 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -6200,6 +6200,11 @@ class dblink:
                # secondhand = list of symlinks that have been skipped due to
                #              their target not existing (will merge later),
 
+               if not os.path.isdir(srcroot):
+                       writemsg("!!! Directory Not Found: D='%s'\n" % srcroot,
+                       noiselevel=-1)
+                       return 1
+
                if not os.path.exists(self.dbcatdir):
                        os.makedirs(self.dbcatdir)