fix makelinks logic again

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

diff --git a/pym/portage.py b/pym/portage.py
index 0c808df06494b83538bc60937778000ad462bf13..0c348bd48ea3890e2f161b21b45dc399aca568e5 100644 (file)
--- 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