| 1 |
commit: b7b0e36986a90311e671e23c8ad16e10bcbb860f |
| 2 |
Author: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Jan 10 00:37:28 2012 +0000 |
| 4 |
Commit: Zac Medico <zmedico <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Jan 10 00:37:28 2012 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=b7b0e369 |
| 7 |
|
| 8 |
env_update: ldsoconf_update flag not reliable |
| 9 |
|
| 10 |
The ldsoconf_update flag was not a reliable indicator of whether |
| 11 |
or not ldconfig needs to be called, since ld.so.conf can have lines |
| 12 |
like "include ld.so.conf.d/*.conf" that pull in outside content which |
| 13 |
may have changed without being detected. |
| 14 |
|
| 15 |
--- |
| 16 |
pym/portage/util/env_update.py | 4 ---- |
| 17 |
1 files changed, 0 insertions(+), 4 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py |
| 20 |
index e8507b3..ace4077 100644 |
| 21 |
--- a/pym/portage/util/env_update.py |
| 22 |
+++ b/pym/portage/util/env_update.py |
| 23 |
@@ -183,8 +183,6 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, |
| 24 |
raise |
| 25 |
oldld = None |
| 26 |
|
| 27 |
- ldsoconf_update = False |
| 28 |
- |
| 29 |
newld = specials["LDPATH"] |
| 30 |
if (oldld != newld): |
| 31 |
#ld.so.conf needs updating and ldconfig needs to be run |
| 32 |
@@ -194,7 +192,6 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, |
| 33 |
for x in specials["LDPATH"]: |
| 34 |
myfd.write(x + "\n") |
| 35 |
myfd.close() |
| 36 |
- ldsoconf_update = True |
| 37 |
|
| 38 |
# Update prelink.conf if we are prelink-enabled |
| 39 |
if prelink_capable: |
| 40 |
@@ -267,7 +264,6 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, |
| 41 |
|
| 42 |
if makelinks and \ |
| 43 |
not mtime_changed and \ |
| 44 |
- not ldsoconf_update and \ |
| 45 |
contents is not None: |
| 46 |
libdir_contents_changed = False |
| 47 |
for mypath, mydata in contents.items(): |
Archives