commit: 34e3661b76e6c8a95e57c95d78ba673be32cc2b1
Author: Bertrand SIMONNET <bsimonnet <AT> chromium <DOT> org>
AuthorDate: Thu Sep 11 08:06:37 2014 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Thu Sep 11 23:28:46 2014 +0000
URL:
http://sources.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=34e3661b
Fix read only detection logic
Portage should check for a read only file system relative to ROOT and
not /.
Acked-by: Zac Medico <zmedico <AT> gentoo.org>
Acked-by: Brian Dolbec <dolsen <AT> gentoo.org>
---
pym/portage/dbapi/vartree.py | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/pym/portage/dbapi/vartree.py b/pym/portage/dbapi/vartree.py
index 5b947dd..8bc6073 100644
--- a/pym/portage/dbapi/vartree.py
+++ b/pym/portage/dbapi/vartree.py
@@ -3723,7 +3723,7 @@ class dblink(object):
break
relative_path = parent[srcroot_len:]
- dirlist.append(os.path.join("/", relative_path))
+ dirlist.append(os.path.join(destroot,
relative_path))
for fname in files:
try:
@@ -3849,8 +3849,7 @@ class dblink(object):
msg = textwrap.wrap(msg, 70)
msg.append("")
for f in rofilesystems:
- msg.append("\t%s" % os.path.join(destroot,
- f.lstrip(os.path.sep)))
+ msg.append("\t%s" % f)
msg.append("")
self._elog("eerror", "preinst", msg)
