summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-07-13 19:29:09 +0000
committerZac Medico <zmedico@gentoo.org>2006-07-13 19:29:09 +0000
commit93ba2edb6eaa837e087c3c194f1a5aed192cddb1 (patch)
treeffd206c22d8ac55058c16dbc56d75312dc39e6a5
parent068ef28ded6db0486dac16c34e5e12bfe43c6935 (diff)
downloadportage-93ba2edb6eaa837e087c3c194f1a5aed192cddb1.tar.gz
portage-93ba2edb6eaa837e087c3c194f1a5aed192cddb1.tar.bz2
portage-93ba2edb6eaa837e087c3c194f1a5aed192cddb1.zip
Make the merge phase bail out if srcroot doesn't exist for bug #140159.
svn path=/main/trunk/; revision=3857
-rw-r--r--pym/portage.py5
1 files changed, 5 insertions, 0 deletions
diff --git a/pym/portage.py b/pym/portage.py
index acaefa30b..4ff350ce7 100644
--- 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)