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.

diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index e8507b3f7cf3fd17482d2f334bb40a283a24326f..ace4077f7c5a6fe11c88312a1d96f280a69ff353 100644 (file)
--- 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():