commit: f9f28734257129dd102d16e22ca5a6432243ddc3
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 17 23:09:23 2019 +0000
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Tue Jun 18 17:11:06 2019 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=f9f28734
ebuild: fix QA_SONAME_NO_SYMLINK
misc-functions.sh and ebuild.5 reference QA_SONAME_NO_SYMLINK.
Update doebuild.py to match this name.
Fixes: c9aebae4633a ("_post_src_install_soname_symlinks: fix bug 543818")
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>
Signed-off-by: Zac Medico <zmedico <AT> gentoo.org>
lib/portage/package/ebuild/doebuild.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/lib/portage/package/ebuild/doebuild.py
b/lib/portage/package/ebuild/doebuild.py
index bea5535bd..67867d33e 100644
--- a/lib/portage/package/ebuild/doebuild.py
+++ b/lib/portage/package/ebuild/doebuild.py
@@ -2263,7 +2263,7 @@ def _post_src_install_soname_symlinks(mysettings, out):
f.close()
metadata = {}
- for k in ("QA_PREBUILT", "QA_NO_SYMLINK"):
+ for k in ("QA_PREBUILT", "QA_SONAME_NO_SYMLINK"):
try:
with io.open(_unicode_encode(os.path.join(
mysettings["PORTAGE_BUILDDIR"],
@@ -2284,14 +2284,14 @@ def _post_src_install_soname_symlinks(mysettings, out):
fnmatch.translate(x.lstrip(os.sep))
for x in portage.util.shlex_split(qa_prebuilt)))
- qa_no_symlink = metadata.get("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
+ qa_soname_no_symlink = metadata.get("QA_SONAME_NO_SYMLINK", "").split()
+ if qa_soname_no_symlink:
+ if len(qa_soname_no_symlink) > 1:
+ qa_soname_no_symlink = "|".join("(%s)" % x for x in
qa_soname_no_symlink)
+ qa_soname_no_symlink = "^(%s)$" % qa_soname_no_symlink
else:
- qa_no_symlink = "^%s$" % qa_no_symlink[0]
- qa_no_symlink = re.compile(qa_no_symlink)
+ qa_soname_no_symlink = "^%s$" % qa_soname_no_symlink[0]
+ qa_soname_no_symlink = re.compile(qa_soname_no_symlink)
libpaths = set(portage.util.getlibpaths(
mysettings["ROOT"], env=mysettings))
@@ -2400,7 +2400,7 @@ 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
not None:
+ if qa_soname_no_symlink and
qa_soname_no_symlink.match(obj.strip(os.sep)) is not None:
continue
obj_file_path = os.path.join(image_dir, obj.lstrip(os.sep))
