1 |
misc-functions.sh and ebuild.5 reference QA_SONAME_NO_SYMLINK. |
2 |
Update doebuild.py to match this name. |
3 |
|
4 |
Signed-off-by: Mike Gilbert <floppym@g.o> |
5 |
--- |
6 |
lib/portage/package/ebuild/doebuild.py | 18 +++++++++--------- |
7 |
1 file changed, 9 insertions(+), 9 deletions(-) |
8 |
|
9 |
diff --git a/lib/portage/package/ebuild/doebuild.py b/lib/portage/package/ebuild/doebuild.py |
10 |
index bea5535bd..64129a6da 100644 |
11 |
--- a/lib/portage/package/ebuild/doebuild.py |
12 |
+++ b/lib/portage/package/ebuild/doebuild.py |
13 |
@@ -2263,7 +2263,7 @@ def _post_src_install_soname_symlinks(mysettings, out): |
14 |
f.close() |
15 |
|
16 |
metadata = {} |
17 |
- for k in ("QA_PREBUILT", "QA_NO_SYMLINK"): |
18 |
+ for k in ("QA_PREBUILT", "QA_SONAME_NO_SYMLINK"): |
19 |
try: |
20 |
with io.open(_unicode_encode(os.path.join( |
21 |
mysettings["PORTAGE_BUILDDIR"], |
22 |
@@ -2284,14 +2284,14 @@ def _post_src_install_soname_symlinks(mysettings, out): |
23 |
fnmatch.translate(x.lstrip(os.sep)) |
24 |
for x in portage.util.shlex_split(qa_prebuilt))) |
25 |
|
26 |
- qa_no_symlink = metadata.get("QA_NO_SYMLINK", "").split() |
27 |
- if qa_no_symlink: |
28 |
- if len(qa_no_symlink) > 1: |
29 |
- qa_no_symlink = "|".join("(%s)" % x for x in qa_no_symlink) |
30 |
- qa_no_symlink = "^(%s)$" % qa_no_symlink |
31 |
+ qa_soname_no_symlink = metadata.get("QA_SONAME_NO_SYMLINK", "").split() |
32 |
+ if qa_soname_no_symlink: |
33 |
+ if len(qa_soname_no_symlink) > 1: |
34 |
+ qa_soname_nosymlink = "|".join("(%s)" % x for x in qa_soname_nosymlink) |
35 |
+ qa_soname_nosymlink = "^(%s)$" % qa_soname_nosymlink |
36 |
else: |
37 |
- qa_no_symlink = "^%s$" % qa_no_symlink[0] |
38 |
- qa_no_symlink = re.compile(qa_no_symlink) |
39 |
+ qa_soname_nosymlink = "^%s$" % qa_soname_nosymlink[0] |
40 |
+ qa_soname_nosymlink = re.compile(qa_soname_nosymlink) |
41 |
|
42 |
libpaths = set(portage.util.getlibpaths( |
43 |
mysettings["ROOT"], env=mysettings)) |
44 |
@@ -2400,7 +2400,7 @@ def _post_src_install_soname_symlinks(mysettings, out): |
45 |
continue |
46 |
if not is_libdir(os.path.dirname(obj)): |
47 |
continue |
48 |
- if qa_no_symlink and qa_no_symlink.match(obj.strip(os.sep)) is not None: |
49 |
+ if qa_soname_nosymlink and qa_soname_nosymlink.match(obj.strip(os.sep)) is not None: |
50 |
continue |
51 |
|
52 |
obj_file_path = os.path.join(image_dir, obj.lstrip(os.sep)) |
53 |
-- |
54 |
2.22.0 |