From 0fe75ba28d0480839a2d41eb5cce0443c177141f Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 3 Nov 2006 20:32:54 +0000 Subject: [PATCH] For bug #153951, fail with a simple "Permission denied" error if the merge phase doesn't have write access to $ROOT. svn path=/main/trunk/; revision=4916 --- pym/portage.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pym/portage.py b/pym/portage.py index ef84e3fc3..d6c5ec0be 100644 --- 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, -- 2.26.2