From: Zac Medico <zmedico@gentoo.org>
Date: Tue, 30 Aug 2011 19:39:51 +0000 (-0700)
Subject: env_update: use ldsoconf_update var
X-Git-Tag: v2.2.0_alpha52~24
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=f87d1ef9b0b79b5a9e8f59291e7173363cd7386e;p=portage.git

env_update: use ldsoconf_update var

This fixes an unintended change in behavior from commit
a37eb8ebd2fad3f8074490a061f067e2c637f05d, so that the ldconfig call
will not be skipped when ld.so.conf has been updated (though ldconfig
is still never called when makelinks=False).
---

diff --git a/pym/portage/util/env_update.py b/pym/portage/util/env_update.py
index 173166351..0d80fa3d8 100644
--- a/pym/portage/util/env_update.py
+++ b/pym/portage/util/env_update.py
@@ -231,6 +231,7 @@ def env_update(makelinks=1, target_root=None, prev_mtimes=None, contents=None,
 
 	if makelinks and \
 		not mtime_changed and \
+		and not ldsoconf_update and \
 		contents is not None:
 		libdir_contents_changed = False
 		for mypath, mydata in contents.items():