diff options
| author | Zac Medico <zmedico@gentoo.org> | 2012-01-09 16:37:28 -0800 |
|---|---|---|
| committer | Zac Medico <zmedico@gentoo.org> | 2012-01-09 16:37:28 -0800 |
| commit | b7b0e36986a90311e671e23c8ad16e10bcbb860f (patch) | |
| tree | cc05b6501b5707c38b20131550cba0bc338d52dd /pym/portage/util/env_update.py | |
| parent | 727eb7f91b3a0b599e577d95e3b3eeb5a2398b68 (diff) | |
| download | portage-b7b0e36986a90311e671e23c8ad16e10bcbb860f.tar.gz portage-b7b0e36986a90311e671e23c8ad16e10bcbb860f.tar.bz2 portage-b7b0e36986a90311e671e23c8ad16e10bcbb860f.zip | |
env_update: ldsoconf_update flag not reliable
The ldsoconf_update flag was not a reliable indicator of whether
or not ldconfig needs to be called, since ld.so.conf can have lines
like "include ld.so.conf.d/*.conf" that pull in outside content which
may have changed without being detected.
Diffstat (limited to 'pym/portage/util/env_update.py')
| -rw-r--r-- | pym/portage/util/env_update.py | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py index e8507b3f7..ace4077f7 100644 --- a/pym/portage/util/env_update.py +++ b/pym/portage/util/env_update.py @@ -183,8 +183,6 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, raise oldld = None - ldsoconf_update = False - newld = specials["LDPATH"] if (oldld != newld): #ld.so.conf needs updating and ldconfig needs to be run @@ -194,7 +192,6 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, for x in specials["LDPATH"]: myfd.write(x + "\n") myfd.close() - ldsoconf_update = True # Update prelink.conf if we are prelink-enabled if prelink_capable: @@ -267,7 +264,6 @@ def _env_update(makelinks, target_root, prev_mtimes, contents, env, if makelinks and \ not mtime_changed and \ - not ldsoconf_update and \ contents is not None: libdir_contents_changed = False for mypath, mydata in contents.items(): |