From 23f944acb41572641f41d156b91c75210da6a148 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Sun, 5 Nov 2006 09:15:37 +0000 Subject: [PATCH] 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 --- bin/prepall | 4 ++-- pym/portage.py | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/bin/prepall b/bin/prepall index 32ea7ef9e..3821e55e9 100755 --- 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 01ad817b8..852041e5b 100644 --- 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) -- 2.26.2