summaryrefslogtreecommitdiffstats
path: root/pym
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2011-10-13 23:14:40 -0700
committerZac Medico <zmedico@gentoo.org>2011-10-13 23:14:40 -0700
commitdcb42a417355510284a35c08a4bf849047122a5c (patch)
tree278ed2a3de602d9e4279eaaf81579f340c0e22f0 /pym
parent55dd7bc8587f4ef48a4ff6ddd4e176fbb72d118d (diff)
downloadportage-dcb42a417355510284a35c08a4bf849047122a5c.tar.gz
portage-dcb42a417355510284a35c08a4bf849047122a5c.tar.bz2
portage-dcb42a417355510284a35c08a4bf849047122a5c.zip
Add QA_SONAME_NO_SYMLINK for bug #387053.
Diffstat (limited to 'pym')
-rw-r--r--pym/portage/package/ebuild/doebuild.py28
1 files changed, 28 insertions, 0 deletions
diff --git a/pym/portage/package/ebuild/doebuild.py b/pym/portage/package/ebuild/doebuild.py
index 156da1aca..6ebe133d4 100644
--- a/pym/portage/package/ebuild/doebuild.py
+++ b/pym/portage/package/ebuild/doebuild.py
@@ -1807,6 +1807,32 @@ def _post_src_install_soname_symlinks(mysettings, out):
if f is not None:
f.close()
+ qa_no_symlink = ""
+ f = None
+ try:
+ f = io.open(_unicode_encode(os.path.join(
+ mysettings["PORTAGE_BUILDDIR"],
+ "build-info", "QA_SONAME_NO_SYMLINK"),
+ encoding=_encodings['fs'], errors='strict'),
+ mode='r', encoding=_encodings['repo.content'],
+ errors='replace')
+ qa_no_symlink = f.read()
+ except IOError as e:
+ if e.errno not in (errno.ENOENT, errno.ESTALE):
+ raise
+ finally:
+ if f is not None:
+ f.close()
+
+ qa_no_symlink = qa_no_symlink.split()
+ if qa_no_symlink:
+ if len(qa_no_symlink) > 1:
+ qa_no_symlink = "|".join("(%s)" % x for x in qa_no_symlink)
+ qa_no_symlink = "^(%s)$" % qa_no_symlink
+ else:
+ qa_no_symlink = "^%s$" % qa_no_symlink[0]
+ qa_no_symlink = re.compile(qa_no_symlink)
+
libpaths = set(portage.util.getlibpaths(
mysettings["ROOT"], env=mysettings))
libpath_inodes = set()
@@ -1863,6 +1889,8 @@ def _post_src_install_soname_symlinks(mysettings, out):
continue
if not is_libdir(os.path.dirname(obj)):
continue
+ if qa_no_symlink and qa_no_symlink.match(obj.strip(os.sep)) is None:
+ continue
obj_file_path = os.path.join(image_dir, obj.lstrip(os.sep))
sym_file_path = os.path.join(os.path.dirname(obj_file_path), soname)