From: Mike Frysinger <vapier@gentoo.org>
Date: Sat, 1 Apr 2006 09:39:59 +0000 (-0000)
Subject: fix makelinks logic again
X-Git-Tag: v2.1_pre8~49
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=2f599276601a2218d9bec8d89129895f152cf42f;p=portage.git

fix makelinks logic again

svn path=/main/trunk/; revision=3048
---

diff --git a/pym/portage.py b/pym/portage.py
index 0c808df06..0c348bd48 100644
--- a/pym/portage.py
+++ b/pym/portage.py
@@ -643,7 +643,7 @@ def env_update(makelinks=1, srcroot=None):
 			mtime_changed = True
 
 		if mtime_changed:
-			if makelinks or srcroot is None:
+			if srcroot is None:
 				ld_cache_update = True
 				continue
 			src_dir = os.path.join(srcroot, x.lstrip(os.sep))
@@ -656,7 +656,7 @@ def env_update(makelinks=1, srcroot=None):
 				break
 
 	# Only run ldconfig as needed
-	if ld_cache_update:
+	if (ld_cache_update or makelinks):
 		# ldconfig has very different behaviour between FreeBSD and Linux
 		if ostype=="Linux" or ostype.lower().endswith("gnu"):
 			# We can't update links if we haven't cleaned other versions first, as