For bug #153951, fail with a simple "Permission denied" error if the merge phase...

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

diff --git a/pym/portage.py b/pym/portage.py
index ef84e3fc3da89314ef4d9f2e441ac812a8e089c5..d6c5ec0beaf60e7ff307772afa6c3d1dc448667c 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3411,6 +3411,10 @@ def movefile(src,dest,newmtime=None,sstat=None,mysettings=None):
 
 def merge(mycat, mypkg, pkgloc, infloc, myroot, mysettings, myebuild=None,
        mytree=None, mydbapi=None, vartree=None, prev_mtimes=None):
+       if not os.access(myroot, os.W_OK):
+               writemsg("Permission denied: access('%s', W_OK)\n" % myroot,
+                       noiselevel=-1)
+               return errno.EACCES
        mylink = dblink(mycat, mypkg, myroot, mysettings, treetype=mytree,
                vartree=vartree)
        return mylink.merge(pkgloc, infloc, myroot, myebuild,