* [gentoo-portage-dev] [PATCH] ebuild: fix QA_SONAME_NO_SYMLINK
@ 2019-06-17 23:09 Mike Gilbert
2019-06-18 17:18 ` Zac Medico
0 siblings, 1 reply; 2+ messages in thread
From: Mike Gilbert @ 2019-06-17 23:09 UTC (permalink / raw
To: gentoo-portage-dev
misc-functions.sh and ebuild.5 reference QA_SONAME_NO_SYMLINK.
Update doebuild.py to match this name.
Signed-off-by: Mike Gilbert <floppym@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..64129a6da 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_nosymlink = "|".join("(%s)" % x for x in qa_soname_nosymlink)
+ qa_soname_nosymlink = "^(%s)$" % qa_soname_nosymlink
else:
- qa_no_symlink = "^%s$" % qa_no_symlink[0]
- qa_no_symlink = re.compile(qa_no_symlink)
+ qa_soname_nosymlink = "^%s$" % qa_soname_nosymlink[0]
+ qa_soname_nosymlink = re.compile(qa_soname_nosymlink)
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_nosymlink and qa_soname_nosymlink.match(obj.strip(os.sep)) is not None:
continue
obj_file_path = os.path.join(image_dir, obj.lstrip(os.sep))
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [gentoo-portage-dev] [PATCH] ebuild: fix QA_SONAME_NO_SYMLINK
2019-06-17 23:09 [gentoo-portage-dev] [PATCH] ebuild: fix QA_SONAME_NO_SYMLINK Mike Gilbert
@ 2019-06-18 17:18 ` Zac Medico
0 siblings, 0 replies; 2+ messages in thread
From: Zac Medico @ 2019-06-18 17:18 UTC (permalink / raw
To: gentoo-portage-dev, Mike Gilbert
[-- Attachment #1.1: Type: text/plain, Size: 469 bytes --]
On 6/17/19 4:09 PM, Mike Gilbert wrote:
> misc-functions.sh and ebuild.5 reference QA_SONAME_NO_SYMLINK.
> Update doebuild.py to match this name.
>
> Signed-off-by: Mike Gilbert <floppym@gentoo.org>
> ---
> lib/portage/package/ebuild/doebuild.py | 18 +++++++++---------
> 1 file changed, 9 insertions(+), 9 deletions(-)
Thanks, merged:
https://gitweb.gentoo.org/proj/portage.git/commit/?id=f9f28734257129dd102d16e22ca5a6432243ddc3
--
Thanks,
Zac
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 981 bytes --]
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-06-18 17:16 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-06-17 23:09 [gentoo-portage-dev] [PATCH] ebuild: fix QA_SONAME_NO_SYMLINK Mike Gilbert
2019-06-18 17:18 ` Zac Medico
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox