Don't check ROOT for writability, but ROOT + EPREFIX instead.

Don't remove EPREFIX from file listings, it confuses as to whether the
paths are correct or not.

svn path=/main/branches/prefix/; revision=4940

diff --git a/bin/prepall b/bin/prepall
index 32ea7ef9ebac9548fa3e4c34790220e901705de5..3821e55e93481c8b084fe3f4b73b3dc07421aa30 100755 (executable)
--- a/bin/prepall
+++ b/bin/prepall
@@ -27,7 +27,7 @@ for i in "${ED}"/opt/*/lib{,32,64} \
                [[ ! -e ${j} ]] && continue
                [[ -L ${j} ]] && continue
                [[ -x ${j} ]] && continue
-               echo "making executable: /${j/${ED}/}"
+               echo "making executable: /${j/${D}/}"
                chmod +x "${j}"
        done
 
@@ -35,7 +35,7 @@ for i in "${ED}"/opt/*/lib{,32,64} \
                [[ ! -e ${j} ]] && continue
                [[ -L ${j} ]] && continue
                [[ ! -x ${j} ]] && continue
-               echo "removing executable bit: /${j/${ED}/}"
+               echo "removing executable bit: /${j/${D}/}"
                chmod -x "${j}"
        done
 done

diff --git a/pym/portage.py b/pym/portage.py
index 01ad817b82be55d9bb66c687898e1b2abd60e8f4..852041e5b89c4b09a62c6711fbd940099cfaa0c0 100644 (file)
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -3416,9 +3416,9 @@ 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)
+       if not os.access(myroot+EPREFIX.lstrip("/"), os.W_OK):
+               writemsg("Permission denied: access('%s', W_OK)\n" %
+                               (myroot+EPREFIX.lstrip("/")), noiselevel=-1)
                return errno.EACCES
        mylink = dblink(mycat, mypkg, myroot, mysettings, treetype=mytree,
                vartree=vartree)